From 10348126fea2c423025b0724916522e3309cf45f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 6 Feb 2013 22:37:55 +0000 Subject: moved ill-named usb-serial to lib/anyio git-svn-id: https://svn.spreadspace.org/avr/trunk@141 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- lib/anyio.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ lib/anyio.h | 33 ++++++++++++++ usb-i2c-sl018/Makefile | 4 +- usb-i2c-sl018/keystore.c | 7 +-- usb-i2c-sl018/tuer-rfid.c | 8 ++-- usb-i2c-sl018/usb_serial.c | 107 -------------------------------------------- usb-i2c-sl018/usb_serial.h | 30 ------------- 7 files changed, 151 insertions(+), 146 deletions(-) create mode 100644 lib/anyio.c create mode 100644 lib/anyio.h delete mode 100644 usb-i2c-sl018/usb_serial.c delete mode 100644 usb-i2c-sl018/usb_serial.h diff --git a/lib/anyio.c b/lib/anyio.c new file mode 100644 index 0000000..38acb2c --- /dev/null +++ b/lib/anyio.c @@ -0,0 +1,108 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013 Christian Pointner + * Othmar Gsenger + * + * 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 . + */ + +#include + +#include "anyio.h" + +#include +#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 serial_stream; + +void anyio_init(const uint32_t baudrate, const uint8_t doublespeed) +{ + Serial_Init(baudrate, doublespeed); + Serial_CreateStream(&serial_stream); + + USB_Init(); + CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream); +} + +void anyio_task(void) +{ + CDC_Device_USBTask(&VirtualSerial_CDC_Interface); + USB_USBTask(); +} + +int16_t anyio_bytes_received(void) +{ + if(stdin == &usb_stream) + return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); + else + return (int16_t)Serial_IsCharReceived(); +} + +void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) +{ + if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) + stdin = stdout = &usb_stream; + else + stdin = stdout = &serial_stream; +} + +void EVENT_USB_Device_Disconnect(void) +{ + stdin = stdout = &serial_stream; +} diff --git a/lib/anyio.h b/lib/anyio.h new file mode 100644 index 0000000..64ac6c8 --- /dev/null +++ b/lib/anyio.h @@ -0,0 +1,33 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013 Christian Pointner + * Othmar Gsenger + * + * 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 . + */ + +#ifndef SPREADSPACE_anyio_h_INCLUDED +#define SPREADSPACE_anyio_h_INCLUDED + +#include + +void anyio_init(const uint32_t baudrate, const uint8_t doublespeed); +void anyio_task(void); +int16_t anyio_bytes_received(void); + +#endif diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile index a547d69..7b43a85 100644 --- a/usb-i2c-sl018/Makefile +++ b/usb-i2c-sl018/Makefile @@ -23,8 +23,8 @@ NAME := tuer-rfid BOARD_TYPE := teensy2 -OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o usb_serial.o statemachine.o -LIBS := util led lufa-descriptor-usbserial +OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o statemachine.o +LIBS := util led lufa-descriptor-usbserial anyio EXTERNAL_LIBS := lufa LUFA_PATH := ../contrib/LUFA-120219 diff --git a/usb-i2c-sl018/keystore.c b/usb-i2c-sl018/keystore.c index c04f90d..5718e3f 100644 --- a/usb-i2c-sl018/keystore.c +++ b/usb-i2c-sl018/keystore.c @@ -25,8 +25,9 @@ #include #include #include -#include "usb_serial.h" + #include "led.h" +#include "anyio.h" #define EEPROM_SIZE 1024 typedef uint8_t keyslot_t[8]; @@ -40,9 +41,9 @@ void flash_keystore_from_stdio(void) printf("Flashing keys:\n\r"); fflush(stdout); for(uint8_t ks_pos=0;ks_pos 0) { ks[byte_pos++]=fgetc(stdin); bytes_received--; diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index d87bde5..69523f9 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -33,13 +33,13 @@ #include "util.h" #include "led.h" +#include "anyio.h" #include "heartbeat.h" #include "stepper.h" #include "ledmatrix.h" #include "sl018.h" #include "keystore.h" -#include "usb_serial.h" #include "statemachine.h" void handle_stdio(uint8_t cmd) @@ -114,7 +114,7 @@ int main(void) cpu_init(); led_init(); - usb_serial_init(); + anyio_init(115200, false); TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 200000)); init_heartbeat(); init_stepper(); @@ -124,10 +124,10 @@ int main(void) sl018_reset(); for(;;) { + anyio_task(); statemachine_task(); - usb_serial_task(); - int16_t bytes_received = usb_serial_bytes_received(); + int16_t bytes_received = anyio_bytes_received(); if(bytes_received > 0) handle_stdio(fgetc(stdin)); diff --git a/usb-i2c-sl018/usb_serial.c b/usb-i2c-sl018/usb_serial.c deleted file mode 100644 index f08d9b3..0000000 --- a/usb-i2c-sl018/usb_serial.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2013 Christian Pointner - * Othmar Gsenger - * - * 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 . - */ - -#include - -#include "usb_serial.h" -#include -#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 serial_stream; - -void usb_serial_init() -{ - Serial_Init(115200,false); - Serial_CreateStream(&serial_stream); - - USB_Init(); - CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream); -} - -void usb_serial_task(void) -{ - CDC_Device_USBTask(&VirtualSerial_CDC_Interface); - USB_USBTask(); -} - -int16_t usb_serial_bytes_received(void) -{ - if(stdin == &usb_stream) - return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); - else - return (int16_t)Serial_IsCharReceived(); -} - -void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) -{ - if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) - stdin = stdout = &usb_stream; - else - stdin = stdout = &serial_stream; -} - -void EVENT_USB_Device_Disconnect(void) -{ - stdin = stdout = &serial_stream; -} diff --git a/usb-i2c-sl018/usb_serial.h b/usb-i2c-sl018/usb_serial.h deleted file mode 100644 index 31ac95e..0000000 --- a/usb-i2c-sl018/usb_serial.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2013 Christian Pointner - * Othmar Gsenger - * - * 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 . - */ - -#ifndef R3TUER_usb_serial_h_INCLUDED -#define R3TUER_usb_serial_h_INCLUDED - -void usb_serial_init(void); -void usb_serial_task(void); -int16_t usb_serial_bytes_received(void); -#endif -- cgit v1.2.3