diff --git a/headers/libs/usb/USBKit.h b/headers/os/device/USBKit.h similarity index 100% rename from headers/libs/usb/USBKit.h rename to headers/os/device/USBKit.h diff --git a/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp b/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp index 892be8fd27..6291f85c09 100644 --- a/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp +++ b/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku Inc. All rights reserved. + * Copyright 2006-2008, Haiku Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -12,6 +12,7 @@ #include #include #include "usb_raw.h" +#include "usb_raw_private.h" #include "BeOSCompatibility.h" diff --git a/src/add-ons/kernel/drivers/bus/usb/usb_raw.h b/src/add-ons/kernel/drivers/bus/usb/usb_raw.h index 318b371c8f..d450856f3a 100644 --- a/src/add-ons/kernel/drivers/bus/usb/usb_raw.h +++ b/src/add-ons/kernel/drivers/bus/usb/usb_raw.h @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku Inc. All rights reserved. + * Copyright 2006-2008, Haiku Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -9,11 +9,8 @@ #ifndef _USB_RAW_H_ #define _USB_RAW_H_ - -#include #include - typedef enum { RAW_COMMAND_GET_VERSION = 0x1000, @@ -152,18 +149,4 @@ typedef union { } isochronous; } raw_command; - -typedef struct { - usb_device device; - benaphore lock; - uint32 reference_count; - - char name[32]; - void *link; - - sem_id notify; - status_t status; - size_t actual_length; -} raw_device; - #endif // _USB_RAW_H_ diff --git a/src/add-ons/kernel/drivers/bus/usb/usb_raw_private.h b/src/add-ons/kernel/drivers/bus/usb/usb_raw_private.h new file mode 100644 index 0000000000..6bb22fc297 --- /dev/null +++ b/src/add-ons/kernel/drivers/bus/usb/usb_raw_private.h @@ -0,0 +1,28 @@ +/* + * Copyright 2008, Haiku Inc. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Michael Lotz + */ + +#ifndef _USB_RAW_PRIVATE_H_ +#define _USB_RAW_PRIVATE_H_ + +#include +#include + +typedef struct { + usb_device device; + benaphore lock; + uint32 reference_count; + + char name[32]; + void *link; + + sem_id notify; + status_t status; + size_t actual_length; +} raw_device; + +#endif // _USB_RAW_PRIVATE_H_ diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile index a4b9e532b9..e19741d36b 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -2,12 +2,9 @@ SubDir HAIKU_TOP src add-ons media media-add-ons usb_webcam ; SetSubDirSupportedPlatformsBeOSCompatible ; -# for USBKit.h -UseLibraryHeaders usb ; - -# Zeta has a libusb.so, we have a USBKit.a +# Zeta has a libusb.so, we have it in libdevice.so if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { - usbKitLibraryName = USBKit.a ; + usbKitLibraryName = libdevice.so ; } else { usbKitLibraryName = usb ; } diff --git a/src/bin/Jamfile b/src/bin/Jamfile index 025b6204d5..2b2c34015a 100644 --- a/src/bin/Jamfile +++ b/src/bin/Jamfile @@ -143,10 +143,10 @@ StdBinCommands mail.cpp : be libmail.so : $(haiku-utils_rsrc) ; -# standard commands that need libbe.so, and the USB Kit +# standard commands that need libbe.so, libdevice.so StdBinCommands usb_dev_info.cpp - : be USBKit.a : $(haiku-utils_rsrc) ; + : be libdevice.so : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libtracker.so StdBinCommands diff --git a/src/kits/device/Jamfile b/src/kits/device/Jamfile index 99c2df4f06..294dc2d59c 100644 --- a/src/kits/device/Jamfile +++ b/src/kits/device/Jamfile @@ -1,10 +1,18 @@ SubDir HAIKU_TOP src kits device ; +# for usb_raw.h that defines the ioctl protocol used by the USB classes +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel drivers bus usb ] : true ; + SharedLibrary libdevice.so : A2D.cpp D2A.cpp DigitalPort.cpp Joystick.cpp SerialPort.cpp + USBConfiguration.cpp + USBDevice.cpp + USBEndpoint.cpp + USBInterface.cpp + USBRoster.cpp : be ; diff --git a/src/libs/usb/USBConfiguration.cpp b/src/kits/device/USBConfiguration.cpp similarity index 100% rename from src/libs/usb/USBConfiguration.cpp rename to src/kits/device/USBConfiguration.cpp diff --git a/src/libs/usb/USBDevice.cpp b/src/kits/device/USBDevice.cpp similarity index 100% rename from src/libs/usb/USBDevice.cpp rename to src/kits/device/USBDevice.cpp diff --git a/src/libs/usb/USBEndpoint.cpp b/src/kits/device/USBEndpoint.cpp similarity index 100% rename from src/libs/usb/USBEndpoint.cpp rename to src/kits/device/USBEndpoint.cpp diff --git a/src/libs/usb/USBInterface.cpp b/src/kits/device/USBInterface.cpp similarity index 100% rename from src/libs/usb/USBInterface.cpp rename to src/kits/device/USBInterface.cpp diff --git a/src/libs/usb/USBRoster.cpp b/src/kits/device/USBRoster.cpp similarity index 100% rename from src/libs/usb/USBRoster.cpp rename to src/kits/device/USBRoster.cpp diff --git a/src/libs/Jamfile b/src/libs/Jamfile index 81f310da3e..94d178f112 100644 --- a/src/libs/Jamfile +++ b/src/libs/Jamfile @@ -18,6 +18,5 @@ SubInclude HAIKU_TOP src libs pdflib ; SubInclude HAIKU_TOP src libs png ; SubInclude HAIKU_TOP src libs stdc++ ; SubInclude HAIKU_TOP src libs termcap ; -SubInclude HAIKU_TOP src libs usb ; SubInclude HAIKU_TOP src libs util ; SubInclude HAIKU_TOP src libs zlib ; diff --git a/src/libs/usb/Jamfile b/src/libs/usb/Jamfile deleted file mode 100644 index 3790d04da4..0000000000 --- a/src/libs/usb/Jamfile +++ /dev/null @@ -1,20 +0,0 @@ -SubDir HAIKU_TOP src libs usb ; - -SetSubDirSupportedPlatformsBeOSCompatible ; - -# for USBKit.h, usb_raw.h and lock.h -UseLibraryHeaders usb ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel drivers bus usb ] : true ; -UsePrivateHeaders kernel ; - -if $(TARGET_PLATFORM) != haiku { - UsePublicHeaders [ FDirName drivers ] ; -} - -StaticLibrary USBKit.a : - USBRoster.cpp - USBDevice.cpp - USBConfiguration.cpp - USBInterface.cpp - USBEndpoint.cpp -;