From 3cb77e33c91158c686050f1e05f6c286f10c6538 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 16 Feb 2013 23:16:26 +0000
Subject: added usbio lib

git-svn-id: https://svn.spreadspace.org/avr/trunk@196 aa12f405-d877-488e-9caf-2d797e2a1cc7
---
 usb-led/Makefile  |  4 ++--
 usb-led/usb-led.c | 61 +++++--------------------------------------------------
 2 files changed, 7 insertions(+), 58 deletions(-)

(limited to 'usb-led')

diff --git a/usb-led/Makefile b/usb-led/Makefile
index 945ef4d..a353ba7 100644
--- a/usb-led/Makefile
+++ b/usb-led/Makefile
@@ -21,9 +21,9 @@
 ##
 
 NAME := usb-led
-BOARD_TYPE := culV3
+BOARD_TYPE := teensy2
 OBJ := $(NAME).o
-LIBS := util led lufa-descriptor-usbserial
+LIBS := util led lufa-descriptor-usbserial usbio
 EXTERNAL_LIBS := lufa
 
 LUFA_PATH := ../contrib/LUFA-120219
diff --git a/usb-led/usb-led.c b/usb-led/usb-led.c
index fc62874..a383ef1 100644
--- a/usb-led/usb-led.c
+++ b/usb-led/usb-led.c
@@ -25,60 +25,11 @@
 #include <avr/wdt.h>
 #include <avr/interrupt.h>
 #include <avr/power.h>
+#include <stdio.h>
 
 #include "util.h"
 #include "led.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*/
-
-FILE usb_stream;
-
-void stdio_init(void)
-{
-  CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream);
-  stdin = &usb_stream;
-  stdout = &usb_stream;
-  stderr = &usb_stream;
-}
+#include "usbio.h"
 
 void handle_cmd(uint8_t cmd)
 {
@@ -99,12 +50,11 @@ int main(void)
 
   cpu_init();
   led_init();
-  USB_Init();
-  stdio_init();
+  usbio_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) {
@@ -113,7 +63,6 @@ int main(void)
       BytesReceived--;
     }
 
-    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
-    USB_USBTask();
+    usbio_task();
   }
 }
-- 
cgit v1.2.3