From 7bb1a84a2b610f73070c8f9c6d51906c8d5f33b0 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Wed, 27 Mar 2013 19:56:12 +0100 Subject: digital/dev2/src: move gpio code to common --- digital/dev2/src/common/gpio.c | 74 ++++++++++++++++++++++++++++++++++++++ digital/dev2/src/common/gpio.h | 37 +++++++++++++++++++ digital/dev2/src/usb_gpio/Makefile | 2 +- digital/dev2/src/usb_gpio/main.c | 33 +++-------------- 4 files changed, 116 insertions(+), 30 deletions(-) create mode 100644 digital/dev2/src/common/gpio.c create mode 100644 digital/dev2/src/common/gpio.h (limited to 'digital') diff --git a/digital/dev2/src/common/gpio.c b/digital/dev2/src/common/gpio.c new file mode 100644 index 00000000..53cd8eda --- /dev/null +++ b/digital/dev2/src/common/gpio.c @@ -0,0 +1,74 @@ +/* gpio.c */ +/* dev2 - Multi-purpose development board using USB and Ethernet. {{{ + * + * Copyright (C) 2013 Nicolas Schodet + * + * APBTeam: + * Web: http://apbteam.org/ + * Email: team AT apbteam DOT org + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * }}} */ +#include "common.h" +#include "io.h" + +#include "gpio.h" + +#include "descriptors.h" +#include "modules/usb/usb.h" + +void +gpio_init (void) +{ + PORTD = 0; + DDRD = 0; +} + +void +gpio_uninit (void) +{ + gpio_init (); +} + +void +gpio_task (void) +{ + Endpoint_SelectEndpoint (GPIO_RX_EPNUM); + /* If data is available from USB: */ + if (Endpoint_ReadWriteAllowed ()) + { + /* Read as much as possible, and clear endpoint. */ + do { + Endpoint_Discard_Byte (); + } while (Endpoint_ReadWriteAllowed ()); + Endpoint_ClearCurrentBank (); + /* Now, print current GPIO state if possible. */ + Endpoint_SelectEndpoint (GPIO_TX_EPNUM); + if (Endpoint_ReadWriteAllowed ()) + { + uint8_t i, pin; + pin = PIND; + for (i = 0; i < 8; i++) + { + Endpoint_Write_Byte (pin & 0x80 ? '1' : '0'); + pin <<= 1; + } + Endpoint_Write_Byte ('\r'); + Endpoint_ClearCurrentBank (); + } + } +} + diff --git a/digital/dev2/src/common/gpio.h b/digital/dev2/src/common/gpio.h new file mode 100644 index 00000000..0a2c123d --- /dev/null +++ b/digital/dev2/src/common/gpio.h @@ -0,0 +1,37 @@ +#ifndef gpio_h +#define gpio_h +/* gpio.h */ +/* dev2 - Multi-purpose development board using USB and Ethernet. {{{ + * + * Copyright (C) 2013 Nicolas Schodet + * + * APBTeam: + * Web: http://apbteam.org/ + * Email: team AT apbteam DOT org + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * }}} */ + +void +gpio_init (void); + +void +gpio_uninit (void); + +void +gpio_task (void); + +#endif /* gpio_h */ diff --git a/digital/dev2/src/usb_gpio/Makefile b/digital/dev2/src/usb_gpio/Makefile index 3de3f7f8..c3767d6e 100644 --- a/digital/dev2/src/usb_gpio/Makefile +++ b/digital/dev2/src/usb_gpio/Makefile @@ -1,6 +1,6 @@ BASE = ../../../avr AVR_PROGS = dev2_gpio -dev2_gpio_SOURCES = main.c descriptors.c select.c +dev2_gpio_SOURCES = main.c descriptors.c select.c gpio.c MODULES = usb CONFIGFILE = avrconfig.h AVR_MCU = at90usb162 diff --git a/digital/dev2/src/usb_gpio/main.c b/digital/dev2/src/usb_gpio/main.c index 734e5198..4e251d93 100644 --- a/digital/dev2/src/usb_gpio/main.c +++ b/digital/dev2/src/usb_gpio/main.c @@ -30,6 +30,7 @@ #include #include "descriptors.h" +#include "common/gpio.h" #include "common/select.h" HANDLES_EVENT (USB_Connect); @@ -39,35 +40,6 @@ HANDLES_EVENT (USB_UnhandledControlPacket); volatile uint8_t usb_connected, usb_configured; -void -gpio_task (void) -{ - Endpoint_SelectEndpoint (GPIO_RX_EPNUM); - /* If data is available from USB: */ - if (Endpoint_ReadWriteAllowed ()) - { - /* Read as much as possible, and clear endpoint. */ - do { - Endpoint_Discard_Byte (); - } while (Endpoint_ReadWriteAllowed ()); - Endpoint_ClearCurrentBank (); - /* Now, print current GPIO state if possible. */ - Endpoint_SelectEndpoint (GPIO_TX_EPNUM); - if (Endpoint_ReadWriteAllowed ()) - { - uint8_t i, pin; - pin = PIND; - for (i = 0; i < 8; i++) - { - Endpoint_Write_Byte (pin & 0x80 ? '1' : '0'); - pin <<= 1; - } - Endpoint_Write_Byte ('\r'); - Endpoint_ClearCurrentBank (); - } - } -} - int main (void) { @@ -145,7 +117,10 @@ EVENT_HANDLER (USB_UnhandledControlPacket) uint8_t output = Endpoint_Read_Byte (); Endpoint_ClearSetupReceived (); /* Select output. */ + gpio_uninit (); select_out (output); + if (select_active (output)) + gpio_init (); /* Send acknowledgement. */ Endpoint_ClearSetupIN (); } -- cgit v1.2.3