[haiku-commits] r39763 - haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 8 Dec 2010 01:44:10 +0100 (CET)
Author: mmlr
Date: 2010-12-08 01:44:10 +0100 (Wed, 08 Dec 2010)
New Revision: 39763
Changeset: http://dev.haiku-os.org/changeset/39763
Removed:
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/BeOSCompatibility.h
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/ReadMe.html
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/USB3.h
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/install.sh
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/uninstall.sh
Modified:
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Jamfile
Log:
Clean out backwards compatibility cruft, local copy of USB header, packageing
rules and support files that don't really apply anymore.
Modified: haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp
2010-12-08 00:32:24 UTC (rev 39762)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp
2010-12-08 00:44:10 UTC (rev 39763)
@@ -260,7 +260,6 @@
}
-#if defined(B_BEOS_VERSION_DANO) || defined(__HAIKU__)
/* usb_serial_select - handle select start */
static status_t
usb_serial_select(void *cookie, uint8 event, uint32 ref, selectsync *sync)
@@ -281,7 +280,6 @@
SerialDevice *device = (SerialDevice *)cookie;
return device->DeSelect(event, sync);
}
-#endif // DANO, HAIKU
/* usb_serial_close - handle close() calls */
@@ -357,10 +355,8 @@
usb_serial_control, /* -> control entry
point */
usb_serial_read, /* -> read entry point
*/
usb_serial_write, /* -> write entry point
*/
-#if defined(B_BEOS_VERSION_DANO) || defined(__HAIKU__)
usb_serial_select, /* -> select entry
point */
usb_serial_deselect /* -> deselect entry
point */
-#endif
};
TRACE_FUNCALLS("> find_device(%s)\n", name);
Modified: haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
2010-12-08 00:32:24 UTC (rev 39762)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
2010-12-08 00:44:10 UTC (rev 39763)
@@ -8,24 +8,21 @@
#ifndef _USB_SERIAL_DRIVER_H_
#define _USB_SERIAL_DRIVER_H_
-#include <OS.h>
-#include <KernelExport.h>
#include <Drivers.h>
-#include <string.h>
+#include <KernelExport.h>
+#include <OS.h>
+#include <USB3.h>
-#ifdef __HAIKU__
#include <lock.h>
-#else
-#include "BeOSCompatibility.h"
-#endif
-#include "kernel_cpp.h"
+#include <string.h>
+
#include "Tracing.h"
-#include "USB3.h"
extern "C" {
#include <tty_module.h>
}
+
#define DRIVER_NAME "usb_serial" // driver name for debug output
#define DEVICES_COUNT 20 // max simultaneously
open devices
Modified: haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Jamfile
2010-12-08 00:32:24 UTC (rev 39762)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Jamfile
2010-12-08 00:44:10 UTC (rev 39763)
@@ -1,12 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers ports usb_serial ;
-SetSubDirSupportedPlatformsBeOSCompatible ;
+UsePrivateKernelHeaders ;
+UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers tty ] : true ;
-if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
- UsePrivateKernelHeaders ;
- UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers tty ] : true ;
-}
-
SubDirC++Flags -fno-rtti ;
KernelAddon usb_serial :
@@ -21,13 +17,3 @@
;
AddResources usb_serial : usb_serial.rdef ;
-
-
-Package haiku-usb_serial-cvs
- :
- usb_serial
- :
- boot home config add-ons kernel drivers bin ;
-
-Package haiku-usb_serial-cvs : <usb_serial!driver>usb_serial.settings.sample
- : boot home config settings kernel drivers sample ;
Other related posts:
- » [haiku-commits] r39763 - haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial - mmlr
