[Kstars-devel] kdeedu/kstars/kstars/indi/fli

[Jasem Mutlaq]

CVS commit by mutlaqja: 

Applying a patch by Benjamin Meyer to make KStars work natively on OSX. The FLI drivers, as of now, are designed only to interface with USB IO in linux and BSD. The current patch does not port the FLI driver to OSX, but provides a workaround to get KStars to properly compile. Unless someone with knowledge on OSX USB IO provides a port to OSX, the FLI driver will remain non-functional under OSX.

CCMAIL: kstars-devel at kde.org
CCMAIL: ben at meyerhome.net 


  A            libfli-usb-sys-null.c   1.1 [UNKNOWN]
  M +5 -1      Makefile.am   1.2
  M +4 -1      libfli-parport.h   1.2
  M +10 -1     libfli-sys.h   1.2
  M +6 -1      libfli-usb.h   1.2


--- kdeedu/kstars/kstars/indi/fli/Makefile.am  #1.1:1.2
@@ -12,3 +12,7 @@
 endif
 
-libfli_a_SOURCES =  libfli.c libfli-camera.c libfli-camera-parport.c libfli-camera-usb.c libfli-filter-focuser.c libfli-mem.c libfli-serial.c libfli-sys.c libfli-usb.c libfli-debug.c $(linux_para) $(linux_usb) $(bsd_usb)
+if NULL
+  null_usb   = libfli-usb-sys-null.c
+endif
+
+libfli_a_SOURCES =  libfli.c libfli-camera.c libfli-camera-parport.c libfli-camera-usb.c libfli-filter-focuser.c libfli-mem.c libfli-serial.c libfli-sys.c libfli-usb.c libfli-debug.c $(linux_para) $(linux_usb) $(bsd_usb) $(null_usb)

--- kdeedu/kstars/kstars/indi/fli/libfli-parport.h  #1.1:1.2
@@ -54,5 +54,8 @@
 
 #else
-#error "Unknown system"
+
+#define unix_parportio NULL
+#warning "Unknown system"
+
 #endif
 

--- kdeedu/kstars/kstars/indi/fli/libfli-sys.h  #1.1:1.2
@@ -60,4 +60,5 @@
 
 #elif defined(__FreeBSD__)
+// FIXME - this does not actually work on OSX
 
 #define __SYSNAME__ "FreeBSD"
@@ -80,5 +81,13 @@
 
 #else
-#error "Unknown system"
+
+#define __SYSNAME__ "Unknown"
+#define __LIBFLI_MINOR__ 1
+#define USB_READ_SIZ_MAX 0
+#define USB_GLOB ""
+#define SERIAL_GLOB ""
+
+#warning "Unknown system"
+
 #endif
 

--- kdeedu/kstars/kstars/indi/fli/libfli-usb.h  #1.1:1.2
@@ -58,5 +58,10 @@
 
 #else
-#error "Unknown system"
+
+#define unix_bulkwrite null_bulkwrite
+#define unix_bulkread null_bulkread
+
+#warning "using null I/O operations!"
+
 #endif