added usbio lib

git-svn-id: https://svn.spreadspace.org/avr/trunk@196 aa12f405-d877-488e-9caf-2d797e2a1cc7

4 files changed, 158 insertions, 58 deletions

diff --git a/lib/usbio.c b/lib/usbio.c
new file mode 100644
index 0000000..1107ee4
--- /dev/null
+++ b/lib/usbio.c
@@ -0,0 +1,118 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ *                     Othmar Gsenger <otti@wirdorange.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+
+#include "usbio.h"
+
+#include <LUFA/Drivers/USB/USB.h>
+#include "lufa-descriptor-usbserial.h"
+#include "LUFA/Drivers/Peripheral/Serial.h"
+
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+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;
+FILE dummy_stream;
+
+int dummy_putchar(char DataByte, FILE *Stream)
+{
+	return 0;
+}
+
+int dummy_getchar(FILE *Stream)
+{
+	return 0;
+}
+
+void usbio_init(void)
+{
+	dummy_stream = (FILE)FDEV_SETUP_STREAM(dummy_putchar, dummy_getchar, _FDEV_SETUP_RW);
+  stdin = stdout = stderr = &dummy_stream;
+
+  USB_Init();
+  CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream);
+}
+
+void usbio_task(void)
+{
+  CDC_Device_USBTask(&VirtualSerial_CDC_Interface); 
+  USB_USBTask(); 
+}
+
+int16_t usbio_bytes_received(void)
+{
+  if(stdin == &usb_stream)
+    return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);
+  else
+    return 0;
+}
+
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)  
+{
+  if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)
+    stdin = stdout = stderr = &usb_stream;
+  else
+    stdin = stdout = stderr = &dummy_stream;
+}
+
+void EVENT_USB_Device_Disconnect(void)
+{
+  stdin = stdout = stderr = &dummy_stream;
+}
diff --git a/lib/usbio.h b/lib/usbio.h
new file mode 100644
index 0000000..cdc5bec
--- /dev/null
+++ b/lib/usbio.h
@@ -0,0 +1,33 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ *                     Othmar Gsenger <otti@wirdorange.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SPREADAVR_usbio_h_INCLUDED
+#define SPREADAVR_usbio_h_INCLUDED
+
+#include <stdint.h>
+
+void usbio_init(void);
+void usbio_task(void);
+int16_t usbio_bytes_received(void);
+
+#endif
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();

   }

 }