i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove zeta-specific stuff from the use of USB Kit, USBKit.h is all we need.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19924 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-01-23 18:58:17 +00:00
parent d8501937f6
commit 634dc81de9
4 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
-1
View File
@@ -6,7 +6,6 @@
#include <OS.h> #include <OS.h>
#include <Autolock.h> #include <Autolock.h>
#include <usb/USBDevice.h>
//#define DEBUG_WRITE_DUMP //#define DEBUG_WRITE_DUMP
//#define DEBUG_DISCARD_DATA //#define DEBUG_DISCARD_DATA
src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
+1 -9
View File
@@ -3,19 +3,11 @@
#include <OS.h> #include <OS.h>
#include <image.h> #include <image.h>
#include <USB.h> #include <usb/USBKit.h>
#include <usb/USBEndpoint.h>
#include <Locker.h> #include <Locker.h>
#include <media/MediaAddOn.h> #include <media/MediaAddOn.h>
#include <support/String.h> #include <support/String.h>
namespace Z {
namespace USB {
class BUSBDevice;
}
}
using Z::USB::BUSBDevice;
typedef struct { typedef struct {
usb_support_descriptor desc; usb_support_descriptor desc;
src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
-1
View File
@@ -5,7 +5,6 @@
#include "CamDebug.h" #include "CamDebug.h"
#include "CamDefs.h" #include "CamDefs.h"
#include <usb/USBDevice.h>
#include <OS.h> #include <OS.h>
#undef B_WEBCAM_MKINTFUNC #undef B_WEBCAM_MKINTFUNC
src/add-ons/media/media-add-ons/usb_webcam/CamRoster.h
+1 -9
View File
@@ -3,21 +3,13 @@
#include <image.h> #include <image.h>
#include <support/Vector.h> #include <support/Vector.h>
#include <usb/USBRoster.h> #include <usb/USBKit.h>
#include <Locker.h> #include <Locker.h>
class WebCamMediaAddOn; class WebCamMediaAddOn;
class CamDevice; class CamDevice;
class CamDeviceAddon; class CamDeviceAddon;
namespace Z {
namespace USB {
class BUSBDevice;
}
}
using Z::USB::BUSBDevice;
class CamRoster : public BUSBRoster class CamRoster : public BUSBRoster
{ {
public: public: