From 72ed993e982d1a2484ef9d54d93757f2f9094547 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 10 Apr 2009 01:16:50 +0200 Subject: * digital/dev2: - added usb_serial_isp, no isp yet. --- digital/dev2/src/common/select.c | 66 ++++++++++++++++++++++++++++++++++ digital/dev2/src/common/select.h | 40 +++++++++++++++++++++ digital/dev2/src/common/serial.c | 77 ++++++++++++++++++++++++++++++++++++++++ digital/dev2/src/common/serial.h | 37 +++++++++++++++++++ 4 files changed, 220 insertions(+) create mode 100644 digital/dev2/src/common/select.c create mode 100644 digital/dev2/src/common/select.h create mode 100644 digital/dev2/src/common/serial.c create mode 100644 digital/dev2/src/common/serial.h (limited to 'digital/dev2/src/common') diff --git a/digital/dev2/src/common/select.c b/digital/dev2/src/common/select.c new file mode 100644 index 00000000..d4e7bb30 --- /dev/null +++ b/digital/dev2/src/common/select.c @@ -0,0 +1,66 @@ +/* select.c - Output selection mechanism. */ +/* dev2 - Multi-purpose development board using USB and Ethernet. {{{ + * + * Copyright (C) 2009 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 "select.h" + +#define ENABLE _BV (2) +#define SELA _BV (5) +#define SELB _BV (4) + +/* Initialise selector. */ +void +select_init (void) +{ + PORTC &= ~(ENABLE | SELA | SELB); + DDRC |= ENABLE | SELA | SELB; +} + +/* Select an output (1-4) or switch off (0, anything else). */ +void +select_out (uint8_t num) +{ + uint8_t p = PORTC & ~(ENABLE | SELA | SELB); + switch (num) + { + case 1: + PORTC = p | ENABLE; + break; + case 2: + PORTC = p | ENABLE | SELA; + break; + case 3: + PORTC = p | ENABLE | SELB; + break; + case 4: + PORTC = p | ENABLE | SELA | SELB; + break; + default: + PORTC = p; + break; + } +} diff --git a/digital/dev2/src/common/select.h b/digital/dev2/src/common/select.h new file mode 100644 index 00000000..30b760bd --- /dev/null +++ b/digital/dev2/src/common/select.h @@ -0,0 +1,40 @@ +#ifndef select_h +#define select_h +/* select.h */ +/* dev2 - Multi-purpose development board using USB and Ethernet. {{{ + * + * Copyright (C) 2009 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. + * + * }}} */ + +static inline uint8_t +select_active (uint8_t num) +{ + return num >= 1 && num <= 4; +} + +void +select_init (void); + +void +select_out (uint8_t num); + +#endif /* select_h */ diff --git a/digital/dev2/src/common/serial.c b/digital/dev2/src/common/serial.c new file mode 100644 index 00000000..f7f3fe06 --- /dev/null +++ b/digital/dev2/src/common/serial.c @@ -0,0 +1,77 @@ +/* serial.c */ +/* dev2 - Multi-purpose development board using USB and Ethernet. {{{ + * + * Copyright (C) 2009 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 "serial.h" +#include "descriptors.h" + +#include "modules/uart/uart.h" +#include "modules/usb/usb.h" + +#define RX D, 2 + +void +serial_init (void) +{ + /* Use Pull-up on RX pin. */ + IO_DDR (RX) &= ~IO_BV (RX); + IO_PORT (RX) |= IO_BV (RX); + uart0_init (); +} + +void +serial_uninit (void) +{ + /* Disable UART. */ + UCSR1B = 0; + IO_PORT (RX) &= ~IO_BV (RX); +} + +void +serial_task (void) +{ + Endpoint_SelectEndpoint (SERIAL_RX_EPNUM); + /* If data is available from USB: */ + if (Endpoint_ReadWriteAllowed ()) + { + /* Read as much as possible, and clear endpoint. */ + do { + uart0_putc (Endpoint_Read_Byte ()); + } while (Endpoint_ReadWriteAllowed ()); + Endpoint_ClearCurrentBank (); + } + /* If data is available from uart and there is room in the TX endpoint: */ + Endpoint_SelectEndpoint (SERIAL_TX_EPNUM); + if (uart0_poll () && Endpoint_ReadWriteAllowed ()) + { + do { + Endpoint_Write_Byte (uart0_getc ()); + } while (uart0_poll () && Endpoint_ReadWriteAllowed ()); + Endpoint_ClearCurrentBank (); + } +} + diff --git a/digital/dev2/src/common/serial.h b/digital/dev2/src/common/serial.h new file mode 100644 index 00000000..5b55e681 --- /dev/null +++ b/digital/dev2/src/common/serial.h @@ -0,0 +1,37 @@ +#ifndef serial_h +#define serial_h +/* serial.h */ +/* dev2 - Multi-purpose development board using USB and Ethernet. {{{ + * + * Copyright (C) 2009 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 +serial_init (void); + +void +serial_uninit (void); + +void +serial_task (void); + +#endif /* serial_h */ -- cgit v1.2.3