aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-11-07 07:23:03 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-11-07 07:23:03 +0000
commit34dc7f241fe0627e21c3a218123d5d9fbc97374c (patch)
tree093ec915c54f126f4e846fb473acf86cb93110b9 /LUFA/Drivers/USB
parent64e5c4084f862267d96b0947f462de7058f3dc4c (diff)
downloadlufa-34dc7f241fe0627e21c3a218123d5d9fbc97374c.tar.gz
lufa-34dc7f241fe0627e21c3a218123d5d9fbc97374c.tar.bz2
lufa-34dc7f241fe0627e21c3a218123d5d9fbc97374c.zip
Make Low Level host demos use void pointers for the configuration descriptor, to prevent warnings when passed to the altered configuration descriptor parsing routines.
Added preprocessor checks to give a human readable error when the class drivers are used when the incompatible NO_STREAM_CALLBACKS compile time option is used.
Diffstat (limited to 'LUFA/Drivers/USB')
-rw-r--r--LUFA/Drivers/USB/Class/Audio.h4
-rw-r--r--LUFA/Drivers/USB/Class/CDC.h4
-rw-r--r--LUFA/Drivers/USB/Class/HID.h4
-rw-r--r--LUFA/Drivers/USB/Class/MIDI.h4
-rw-r--r--LUFA/Drivers/USB/Class/MassStorage.h4
-rw-r--r--LUFA/Drivers/USB/Class/Printer.h4
-rw-r--r--LUFA/Drivers/USB/Class/RNDIS.h4
-rw-r--r--LUFA/Drivers/USB/Class/StillImage.h4
8 files changed, 32 insertions, 0 deletions
diff --git a/LUFA/Drivers/USB/Class/Audio.h b/LUFA/Drivers/USB/Class/Audio.h
index c429b330f..e517f3be0 100644
--- a/LUFA/Drivers/USB/Class/Audio.h
+++ b/LUFA/Drivers/USB/Class/Audio.h
@@ -51,6 +51,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
#if defined(USB_CAN_BE_DEVICE)
#include "Device/Audio.h"
diff --git a/LUFA/Drivers/USB/Class/CDC.h b/LUFA/Drivers/USB/Class/CDC.h
index 8ed0cf671..3d40dff3a 100644
--- a/LUFA/Drivers/USB/Class/CDC.h
+++ b/LUFA/Drivers/USB/Class/CDC.h
@@ -53,6 +53,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
+
#if defined(USB_CAN_BE_DEVICE)
#include "Device/CDC.h"
#endif
diff --git a/LUFA/Drivers/USB/Class/HID.h b/LUFA/Drivers/USB/Class/HID.h
index f1e23678d..f5f9575c7 100644
--- a/LUFA/Drivers/USB/Class/HID.h
+++ b/LUFA/Drivers/USB/Class/HID.h
@@ -54,6 +54,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
+
#if defined(USB_CAN_BE_DEVICE)
#include "Device/HID.h"
#endif
diff --git a/LUFA/Drivers/USB/Class/MIDI.h b/LUFA/Drivers/USB/Class/MIDI.h
index a38c3d878..96b23efcb 100644
--- a/LUFA/Drivers/USB/Class/MIDI.h
+++ b/LUFA/Drivers/USB/Class/MIDI.h
@@ -56,6 +56,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
+
#if defined(USB_CAN_BE_DEVICE)
#include "Device/MIDI.h"
#endif
diff --git a/LUFA/Drivers/USB/Class/MassStorage.h b/LUFA/Drivers/USB/Class/MassStorage.h
index d2ad7dc09..962b4d62b 100644
--- a/LUFA/Drivers/USB/Class/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/MassStorage.h
@@ -53,6 +53,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
+
#if defined(USB_CAN_BE_DEVICE)
#include "Device/MassStorage.h"
#endif
diff --git a/LUFA/Drivers/USB/Class/Printer.h b/LUFA/Drivers/USB/Class/Printer.h
index b1d41fcc5..2f0285bae 100644
--- a/LUFA/Drivers/USB/Class/Printer.h
+++ b/LUFA/Drivers/USB/Class/Printer.h
@@ -54,6 +54,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
+
#if defined(USB_CAN_BE_HOST)
#include "Host/Printer.h"
#endif
diff --git a/LUFA/Drivers/USB/Class/RNDIS.h b/LUFA/Drivers/USB/Class/RNDIS.h
index 87616ae14..7b250a4dd 100644
--- a/LUFA/Drivers/USB/Class/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/RNDIS.h
@@ -52,6 +52,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
+
#if defined(USB_CAN_BE_DEVICE)
#include "Device/RNDIS.h"
#endif
diff --git a/LUFA/Drivers/USB/Class/StillImage.h b/LUFA/Drivers/USB/Class/StillImage.h
index 273b97a77..794d612c1 100644
--- a/LUFA/Drivers/USB/Class/StillImage.h
+++ b/LUFA/Drivers/USB/Class/StillImage.h
@@ -52,6 +52,10 @@
/* Includes: */
#include "../HighLevel/USBMode.h"
+ #if defined(NO_STREAM_CALLBACKS)
+ #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
+ #endif
+
#if defined(USB_CAN_BE_HOST)
#include "Host/StillImage.h"
#endif