Ticket #5754: pc_serial.diff

src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp

@@ -26 +26 @@
 config_manager_for_driver_module_info *gConfigManagerModule = NULL;
 isa_module_info *gISAModule = NULL;
 pci_module_info *gPCIModule = NULL;
-//XXX: ifndef __HAIKU__
+#ifdef __HAIKU__
+tty_module_info *gTTYModule = NULL;
+#else
 tty_module_info_v1_bone *gTTYModule = NULL;
+#endif
 struct ddomain gSerialDomain;
 sem_id gDriverLock = -1;
 bool gHandleISA = false;
@@ -730 +733 @@
     status = ENOENT;
 
     memset(&gSerialDomain, 0, sizeof(gSerialDomain));
+#ifndef __HAIKU__
     ddbackground(&gSerialDomain);
+#endif
 
 
     scan_bus(B_ISA_BUS);

src/add-ons/kernel/drivers/ports/pc_serial/Driver.h

@@ -191 +191 @@
 extern config_manager_for_driver_module_info *gConfigManagerModule;
 extern isa_module_info *gISAModule;
 extern pci_module_info *gPCIModule;
-//extern tty_module_info *gTTYModule;
+#ifdef __HAIKU__
+extern tty_module_info *gTTYModule;
+#else
 extern tty_module_info_v1_bone *gTTYModule;
+#endif
 extern struct ddomain gSerialDomain;
 
 extern "C" {
@@ -202 +205 @@
 bool        pc_serial_service(struct tty *ptty, struct ddrover *ddr, uint flags);
 int32       pc_serial_interrupt(void *arg);
 
-status_t    pc_serial_open(const char *name, uint32 flags, void **cookie);
-status_t    pc_serial_read(void *cookie, off_t position, void *buffer, size_t *numBytes);
-status_t    pc_serial_write(void *cookie, off_t position, const void *buffer, size_t *numBytes);
-status_t    pc_serial_control(void *cookie, uint32 op, void *arg, size_t length);
-status_t    pc_serial_select(void *cookie, uint8 event, uint32 ref, selectsync *sync);
-status_t    pc_serial_deselect(void *coookie, uint8 event, selectsync *sync);
-status_t    pc_serial_close(void *cookie);
-status_t    pc_serial_free(void *cookie);
+static status_t pc_serial_open(const char *name, uint32 flags, void **cookie);
+static status_t pc_serial_read(void *cookie, off_t position, void *buffer, size_t *numBytes);
+static status_t pc_serial_write(void *cookie, off_t position, const void *buffer, size_t *numBytes);
+static status_t pc_serial_control(void *cookie, uint32 op, void *arg, size_t length);
+static status_t pc_serial_select(void *cookie, uint8 event, uint32 ref, selectsync *sync);
+static status_t pc_serial_deselect(void *coookie, uint8 event, selectsync *sync);
+static status_t pc_serial_close(void *cookie);
+static status_t pc_serial_free(void *cookie);
 
 const char **publish_devices();
 device_hooks *find_device(const char *name);