aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/ClassDriver/AudioOutput
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-06-14 07:44:02 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-06-14 07:44:02 +0000
commit4d3a594f3e26447ba223ac58292c9a77480ceed3 (patch)
tree1bf9da2a2290ccdb594dffd8af29cfafae231900 /Demos/Device/ClassDriver/AudioOutput
parent9798440ca4f694e7cd8312a51b82e59589f1ebeb (diff)
downloadlufa-4d3a594f3e26447ba223ac58292c9a77480ceed3.tar.gz
lufa-4d3a594f3e26447ba223ac58292c9a77480ceed3.tar.bz2
lufa-4d3a594f3e26447ba223ac58292c9a77480ceed3.zip
Changed per-device controller preprocessor checks over to per-device series for better device control.
Fixed error in Endpoint.c using HSOFI rather than SOFI for counting elapsed milliseconds.
Diffstat (limited to 'Demos/Device/ClassDriver/AudioOutput')
-rw-r--r--Demos/Device/ClassDriver/AudioOutput/AudioOutput.h2
-rw-r--r--Demos/Device/ClassDriver/AudioOutput/Descriptors.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
index f8d703e3f..b09fed5d8 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
@@ -51,7 +51,7 @@
#include <LUFA/Drivers/USB/Class/Device/Audio.h>
/* Macros: */
- #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)
+ #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
#define TCCRxA TCCR3A
#define TCCRxB TCCR3B
#define OCRxA OCR3A
diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
index f007890e6..149b5ed53 100644
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
@@ -43,7 +43,7 @@
#include <avr/pgmspace.h>
/* Macros: */
- #if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)
+ #if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)
/** Endpoint number of the Audio isochronous streaming data endpoint. */
#define AUDIO_STREAM_EPNUM 1
#else