mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build-system: add OpenBSD support

Browse source 
Rename linux.c to unix.c and add OpenBSD support as well. Conditionally compile based on OS.

Signed-off-by: Kristaps Dzonsons <kristaps@bsd.lv>
This commit is contained in:
Kristaps Dz 2018-07-18 11:04:35 +02:00 • committed by Dirk Hohndel
parent 8da7ddc64b
commit 51066e5478
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/CMakeLists.txt
View file

@ -4,7 +4,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(ANDROID) if(ANDROID)
set(PLATFORM_SRC android.cpp) set(PLATFORM_SRC android.cpp)
else() else()
set(PLATFORM_SRC linux.c) set(PLATFORM_SRC unix.c)
endif() endif()
elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
set(PLATFORM_SRC android.cpp) set(PLATFORM_SRC android.cpp)
@ -12,6 +12,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(PLATFORM_SRC macos.c) set(PLATFORM_SRC macos.c)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(PLATFORM_SRC windows.c) set(PLATFORM_SRC windows.c)
elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
set(PLATFORM_SRC unix.c)
endif() endif()
if(FTDISUPPORT) if(FTDISUPPORT)

18
core/linux.c → core/unix.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* linux.c */ /* unix.c */
/* implements Linux specific functions */ /* implements UNIX specific functions */
#include "ssrf.h" #include "ssrf.h"
#include "dive.h" #include "dive.h"
#include "subsurface-string.h" #include "subsurface-string.h"
@ -16,8 +16,8 @@
#include <pwd.h> #include <pwd.h>
// the DE should provide us with a default font and font size... // the DE should provide us with a default font and font size...
const char linux_system_divelist_default_font[] = "Sans"; const char unix_system_divelist_default_font[] = "Sans";
const char *system_divelist_default_font = linux_system_divelist_default_font; const char *system_divelist_default_font = unix_system_divelist_default_font;
double system_divelist_default_font_size = -1.0; double system_divelist_default_font_size = -1.0;
void subsurface_OS_pref_setup(void) void subsurface_OS_pref_setup(void)
@ -111,6 +111,13 @@ int enumerate_devices(device_callback_t callback, void *userdata, int dc_type)
size_t len; size_t len;
if (dc_type != DC_TYPE_UEMIS) { if (dc_type != DC_TYPE_UEMIS) {
const char *dirname = "/dev"; const char *dirname = "/dev";
#ifdef __OpenBSD__
const char *patterns[] = {
"ttyU*",
"ttyC*",
NULL
};
#else
const char *patterns[] = { const char *patterns[] = {
"ttyUSB*", "ttyUSB*",
"ttyS*", "ttyS*",
@ -118,6 +125,7 @@ int enumerate_devices(device_callback_t callback, void *userdata, int dc_type)
"rfcomm*", "rfcomm*",
NULL NULL
}; };
#endif
dp = opendir(dirname); dp = opendir(dirname);
if (dp == NULL) { if (dp == NULL) {
@ -143,6 +151,7 @@ int enumerate_devices(device_callback_t callback, void *userdata, int dc_type)
} }
closedir(dp); closedir(dp);
} }
#ifdef __linux__
if (dc_type != DC_TYPE_SERIAL) { if (dc_type != DC_TYPE_SERIAL) {
int num_uemis = 0; int num_uemis = 0;
file = fopen("/proc/mounts", "r"); file = fopen("/proc/mounts", "r");
@ -177,6 +186,7 @@ int enumerate_devices(device_callback_t callback, void *userdata, int dc_type)
if (num_uemis == 1 && entries == 1) /* if we found only one and it's a mounted Uemis, pick it */ if (num_uemis == 1 && entries == 1) /* if we found only one and it's a mounted Uemis, pick it */
index = 0; index = 0;
} }
#endif
return index; return index;
} }