From eeddf217d0d7bf92cddccb0362c57e71c3a7ce8f Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 16 Feb 2013 23:31:17 +0000
Subject: usb-pwm now uses usbio as well

git-svn-id: https://svn.spreadspace.org/avr/trunk@197 aa12f405-d877-488e-9caf-2d797e2a1cc7
---
 usb-pwm/usb-pwm.c | 60 +++++--------------------------------------------------
 1 file changed, 5 insertions(+), 55 deletions(-)

(limited to 'usb-pwm/usb-pwm.c')

diff --git a/usb-pwm/usb-pwm.c b/usb-pwm/usb-pwm.c
index fd1e916..7fdf4a1 100644
--- a/usb-pwm/usb-pwm.c
+++ b/usb-pwm/usb-pwm.c
@@ -25,50 +25,12 @@
 #include <avr/wdt.h>
 #include <avr/interrupt.h>
 #include <avr/power.h>
+#include <stdio.h>
 
 #include "util.h"
 #include "led.h"
+#include "usbio.h"
 
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2012.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-#include <LUFA/Drivers/USB/USB.h>
-#include "lufa-descriptor-usbserial.h"
-
-USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
-  {
-    .Config =
-      {
-        .ControlInterfaceNumber         = 0,
-
-        .DataINEndpointNumber           = CDC_TX_EPNUM,
-        .DataINEndpointSize             = CDC_TXRX_EPSIZE,
-        .DataINEndpointDoubleBank       = false,
-
-        .DataOUTEndpointNumber          = CDC_RX_EPNUM,
-        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,
-        .DataOUTEndpointDoubleBank      = false,
-
-        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,
-        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,
-        .NotificationEndpointDoubleBank = false,
-      },
-  };
-
-void EVENT_USB_Device_ConfigurationChanged(void)
-{
-  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
-}
-
-void EVENT_USB_Device_ControlRequest(void)
-{
-  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
-}
-/* end LUFA CDC-ACM specific definitions*/
 
 #define PWM_VAL OCR1BL
 
@@ -111,16 +73,6 @@ inline void pwm_dec(void)
 }
 
 
-FILE usb_stream;
-
-void stdio_init(void)
-{
-  CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream);
-  stdin = &usb_stream;
-  stdout = &usb_stream;
-  stderr = &usb_stream;
-}
-
 void handle_cmd(uint8_t cmd)
 {
   switch(cmd) {
@@ -141,13 +93,12 @@ int main(void)
 
   cpu_init();
   led_init();
-  USB_Init();
-  stdio_init();
+  usbio_init();
   pwm_init();
   sei();
 
   for(;;) {
-    int16_t BytesReceived = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);
+    int16_t BytesReceived = usbio_bytes_received();
     while(BytesReceived > 0) {
       int ReceivedByte = fgetc(stdin);
       if(ReceivedByte != EOF) {
@@ -156,7 +107,6 @@ int main(void)
       BytesReceived--;
     }
 
-    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
-    USB_USBTask();
+    usbio_task();
   }
 }
-- 
cgit v1.2.3