From 4d3a594f3e26447ba223ac58292c9a77480ceed3 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 14 Jun 2009 07:44:02 +0000 Subject: 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. --- Demos/Device/LowLevel/AudioOutput/AudioOutput.h | 2 +- Demos/Device/LowLevel/AudioOutput/Descriptors.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Demos/Device/LowLevel/AudioOutput') diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.h b/Demos/Device/LowLevel/AudioOutput/AudioOutput.h index d722d535b..7970efe7e 100644 --- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.h +++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.h @@ -48,7 +48,7 @@ #include /* 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/LowLevel/AudioOutput/Descriptors.h b/Demos/Device/LowLevel/AudioOutput/Descriptors.h index e1145717e..d7abc5d1b 100644 --- a/Demos/Device/LowLevel/AudioOutput/Descriptors.h +++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.h @@ -137,7 +137,7 @@ */ #define EP_ACCEPTS_SMALL_PACKETS (0 << 7) - #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 -- cgit v1.2.3