From a783671c72aa4b9fde5bf7a2af3bf11a7c876191 Mon Sep 17 00:00:00 2001 From: Othmar Gsenger Date: Wed, 6 Feb 2013 20:56:51 +0000 Subject: moved keystore and usb/serial to seperate files stdio_ptr might need some improvement git-svn-id: https://svn.spreadspace.org/avr/trunk@134 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- usb-i2c-sl018/Makefile | 2 +- usb-i2c-sl018/keystore.c | 109 +++++++++++++++++++++++ usb-i2c-sl018/keystore.h | 31 +++++++ usb-i2c-sl018/tuer-rfid.c | 217 +++++++-------------------------------------- usb-i2c-sl018/usb_serial.c | 126 ++++++++++++++++++++++++++ usb-i2c-sl018/usb_serial.h | 32 +++++++ 6 files changed, 329 insertions(+), 188 deletions(-) create mode 100644 usb-i2c-sl018/keystore.c create mode 100644 usb-i2c-sl018/keystore.h create mode 100644 usb-i2c-sl018/usb_serial.c create mode 100644 usb-i2c-sl018/usb_serial.h diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile index 2bf0924..1900a9b 100644 --- a/usb-i2c-sl018/Makefile +++ b/usb-i2c-sl018/Makefile @@ -23,7 +23,7 @@ NAME := tuer-rfid BOARD_TYPE := teensy2 -OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o +OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o usb_serial.o LIBS := util led lufa-descriptor-usbserial EXTERNAL_LIBS := lufa diff --git a/usb-i2c-sl018/keystore.c b/usb-i2c-sl018/keystore.c new file mode 100644 index 0000000..1d8a5db --- /dev/null +++ b/usb-i2c-sl018/keystore.c @@ -0,0 +1,109 @@ +/* + * 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 "keystore.h" +#include +#include +#include "usb_serial.h" +#include "led.h" + +#define EEPROM_SIZE 1024 +typedef uint8_t keyslot_t[8]; +keyslot_t EEMEM keystore[EEPROM_SIZE/sizeof(keyslot_t)]; + + +void flash_keystore_from_stdio(FILE * stdio) +{ + keyslot_t ks; + uint8_t byte_pos=0; + fprintf(stdio,"Flashing keys:\n\r"); + fflush(stdio); + for(uint8_t ks_pos=0;ks_pos 0) { + ks[byte_pos++]=fgetc(stdio); + bytes_received--; + if (byte_pos == sizeof(ks)) { + byte_pos=0; + eeprom_update_block(&ks,&keystore[ks_pos],sizeof(ks)); + ks_pos++; + fputc('.', stdio); + fflush(stdio); + led_toggle(); + } + } + } + fprintf(stdio,"\n"); + fputc(0, stdio); + led_off(); +} + +void dump_keystore_to_stdio(FILE * stdio) +{ + keyslot_t ks; + for(uint8_t ks_pos=0;ks_pos + * 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_keystore_h_INCLUDED +#define R3TUER_keystore_h_INCLUDED +#include +void flash_keystore_from_stdio(FILE * stdio); +void dump_keystore_to_stdio(FILE * stdio); +uint8_t keystore_check_card(const uint8_t * uid, uint8_t uid_len); + +#endif diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index 7beccb0..6823c71 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include "LUFA/Drivers/Peripheral/TWI.h" #include #include @@ -36,127 +38,11 @@ #include "stepper.h" #include "ledmatrix.h" #include "sl018.h" - -#include "LUFA/Drivers/Peripheral/TWI.h" -#include "LUFA/Drivers/Peripheral/Serial.h" -#include "LUFA/Drivers/Misc/RingBuffer.h" - -#include -#define EEPROM_SIZE 1024 -typedef uint8_t keyslot_t[8]; -keyslot_t EEMEM keystore[EEPROM_SIZE/sizeof(keyslot_t)]; - -FILE usb_stream; -FILE serial_stream; -FILE * stdio = &serial_stream; - -/* - LUFA Library - Copyright (C) Dean Camera, 2012. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ +#include "keystore.h" +#include "usb_serial.h" +FILE * * stdio_ptr = NULL; -#include -#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); -} - -void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) -{ - if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) - stdio = &usb_stream; - else - stdio = &serial_stream; -} - -void EVENT_USB_Device_Disconnect(void) -{ - stdio = &serial_stream; -} -/* end LUFA CDC-ACM specific definitions*/ - - - -int16_t stdio_bytes_received(void) -{ - if(stdio == &usb_stream) - return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); - else - return (int16_t)Serial_IsCharReceived(); -} - - -void flash_keystore_from_stdio(void) -{ - keyslot_t ks; - uint8_t byte_pos=0; - fprintf(stdio,"Flashing keys:\n\r"); - fflush(stdio); - for(uint8_t ks_pos=0;ks_pos 0) { - ks[byte_pos++]=fgetc(stdio); - bytes_received--; - if (byte_pos == sizeof(ks)) { - byte_pos=0; - eeprom_update_block(&ks,&keystore[ks_pos],sizeof(ks)); - ks_pos++; - fputc('.', stdio); - fflush(stdio); - led_toggle(); - } - } - } - fprintf(stdio,"\n"); - fputc(0, stdio); - led_off(); -} - -void dump_keystore_to_stdio(void) -{ - keyslot_t ks; - for(uint8_t ks_pos=0;ks_pos 0) - handle_stdio(fgetc(stdio)); + handle_stdio(fgetc(*stdio_ptr)); - if (sl018_check_for_new_card(stdio)) + if (sl018_check_for_new_card(*stdio_ptr)) handle_card(); handle_heartbeat(); } diff --git a/usb-i2c-sl018/usb_serial.c b/usb-i2c-sl018/usb_serial.c new file mode 100644 index 0000000..3dd79e1 --- /dev/null +++ b/usb-i2c-sl018/usb_serial.c @@ -0,0 +1,126 @@ +/* + * 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 "usb_serial.h" +#include +#include "lufa-descriptor-usbserial.h" +#include "LUFA/Drivers/Peripheral/Serial.h" + +FILE usb_stream; +FILE serial_stream; +FILE * stdio = &serial_stream; + +FILE * * usb_serial_get_stdio_ptr(void) +{ + return &stdio; +} + + +/* + 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 usb_serial_init() +{ + USB_Init(); + Serial_Init(115200,false); + Serial_CreateStream(&serial_stream); + CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream); +} + +void usb_serial_task(void) +{ + CDC_Device_USBTask(&VirtualSerial_CDC_Interface); + USB_USBTask(); +} + +void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) +{ + if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR) + stdio = &usb_stream; + else + stdio = &serial_stream; +} + +void EVENT_USB_Device_Disconnect(void) +{ + stdio = &serial_stream; +} +/* end LUFA CDC-ACM specific definitions*/ + +int16_t stdio_bytes_received(void) +{ + if(stdio == &usb_stream) + return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); + else + return (int16_t)Serial_IsCharReceived(); +} + +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*/ + + + +int16_t usb_serial_bytes_received(void) +{ + if(stdio == &usb_stream) + return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); + else + return (int16_t)Serial_IsCharReceived(); +} + diff --git a/usb-i2c-sl018/usb_serial.h b/usb-i2c-sl018/usb_serial.h new file mode 100644 index 0000000..5f821f8 --- /dev/null +++ b/usb-i2c-sl018/usb_serial.h @@ -0,0 +1,32 @@ +/* + * 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 +#include + +FILE * * usb_serial_get_stdio_ptr(void); +void usb_serial_init(void); +void usb_serial_task(void); +int16_t usb_serial_bytes_received(void); +#endif -- cgit v1.2.3