more Zeta vs Haiku USB Kit cleanup

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19927 a95241bf-73f2-0310-859d-f6bbb57e9c96
2007-01-23 20:11:56 +00:00
parent fc812aa9ae
commit 8e9a5067ef
5 changed files with 10 additions and 10 deletions
@@ -3,7 +3,13 @@

 #include <OS.h>
 #include <image.h>
-#include <usb/USBKit.h>
+#ifdef __HAIKU__
+#  include <USB3.h>
+#  include <USBKit.h>
+#else
+#  include <USB.h>
+#  include <usb/USBKit.h>
+#endif
 #include <Locker.h>
 #include <media/MediaAddOn.h>
 #include <support/String.h>
@@ -3,11 +3,11 @@

 #include <image.h>
 #include <support/Vector.h>
-#include <usb/USBKit.h>
 #include <Locker.h>

+#include "CamDevice.h"
+
 class WebCamMediaAddOn;
-class CamDevice;
 class CamDeviceAddon;

 class CamRoster : public BUSBRoster
@@ -37,7 +37,7 @@ csTransformsSources = Bayer.cpp ;
 local sensorsSources ;
 sensorsSources = hdcs1000.cpp hv7131e1.cpp tas5110c1b.cpp ;

-## how to build header files from sources to include teh list of built-in addons.
+## how to build header files from sources to include the list of built-in addons.

 rule USBWebcamHeaderGen
 {
@@ -1,7 +1,5 @@
 #include "QuickCamDevice.h"

-#include <usb/USBDevice.h>
-
 const usb_named_support_descriptor kSupportedDevices[] = {
 {{ 0, 0, 0, 0x046d, 0x0840 }, "Logitech", "QuickCam Express"},
 {{ 0, 0, 0, 0x046d, 0x0850 }, "Logitech", "QuickCam Express LEGO"},
@@ -4,10 +4,6 @@
 #include "CamBufferingDeframer.h"
 #include "CamStreamingDeframer.h"

-#include <usb/USBDevice.h>
-#include <usb/USBConfiguration.h>
-#include <usb/USBInterface.h>
-
 #include <interface/Bitmap.h>
 #include <media/Buffer.h>