From: Michel Pollet Date: Tue, 30 Oct 2012 11:30:21 +0000 (+0000) Subject: usb: Made the usb example optional X-Git-Tag: v1.1~32 X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=dcf0210b156b03d83849cf5c3e2f8b78072fc2f0;p=sx%2Fsimavr.git usb: Made the usb example optional Downloading extra sources is against debian policy and was a blocker to get simavr in debian. Made the board_usb example optional, it will require an explicit make. Signed-off-by: Michel Pollet --- diff --git a/examples/Makefile b/examples/Makefile index 680d0b7..3fd6771 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,11 +1,6 @@ boards_base=${wildcard board_*} -# remove vhci example on anything but linux -ifneq (${shell uname}, Linux) -boards=${subst board_usb,,$(boards_base)} -else boards=$(boards_base) -endif all: for bi in ${boards}; do $(MAKE) -C $$bi; done @@ -13,3 +8,10 @@ all: clean: for bi in ${boards}; do $(MAKE) -C $$bi clean; done +# +# The USB example is not made by default, as it downloads stuff +# for the vhci library, it fails the debian policy on being able +# to build offline. +# +extra_board_usb: + make -C extra_board_usb diff --git a/examples/board_usb/.gitignore b/examples/board_usb/.gitignore deleted file mode 100644 index 04e1d75..0000000 --- a/examples/board_usb/.gitignore +++ /dev/null @@ -1 +0,0 @@ -simusb_flash.bin diff --git a/examples/board_usb/Makefile b/examples/board_usb/Makefile deleted file mode 100644 index f7f668e..0000000 --- a/examples/board_usb/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright 2012 Torbjorn Tyridal -# -# This file is part of simavr. -# -# simavr 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 -# (at your option) any later version. -# -# simavr 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 simavr. If not, see . - -target= simusb -firm_src = at90usb162_cdc_loopback.c -firmware = ${firm_src:.c=.hex} -simavr = ../../ - -IPATH = . -IPATH += ../parts -IPATH += ../vhci/include -IPATH += ../vhci -IPATH += ${simavr}/include -IPATH += ${simavr}/simavr/sim -#IPATH += /usr/local/include - -VPATH = . -VPATH += ../parts - -LDFLAGS += -lpthread -lusb_vhci -L../vhci/lib - -all: obj ${firmware} ${target} - -include ${simavr}/Makefile.common - -board = ${OBJ}/${target}.elf - -${board} : ${OBJ}/vhci_usb.o -${board} : ${OBJ}/${target}.o - -../vhci/lib/libusb_vhci.a: - @echo -n "BUILDIN $@ " - @{ export CC=;export CFLAGS=; $(MAKE) -j -C ../vhci >/tmp/vhci.build.log 2>&1 || \ - { echo "ERROR check /tmp/vhci.build.log"; exit 1; }; } && \ - echo " Done" - -vhci : ../vhci/lib/libusb_vhci.a - -clean-vhci: - $(MAKE) -C ../vhci clean - -${target}: vhci ${board} - @echo $@ done - -clean: clean-${OBJ} clean-vhci - rm -rf *.a *.axf *.hex ${target} *.vcd diff --git a/examples/board_usb/README b/examples/board_usb/README deleted file mode 100644 index 0db5550..0000000 --- a/examples/board_usb/README +++ /dev/null @@ -1,45 +0,0 @@ -This will bridge the usb avr to the vhci-usb virtual usb host. - -You'll need vhci-usb and vhci-usb-lib to build and use it. -(http://sourceforge.net/projects/usb-vhci/) - -When setup, your avr project will connect to the linux usb system -as a real device. - -BUILDING usb-vhci ------------------ -git://usb-vhci.git.sourceforge.net/gitroot/usb-vhci/vhci_hcd - -The driver doesn't compile on recent linux kernels. -(commit 203800f0 Mon Apr 4) -0001-SPIN_LOCK_UNLOCKED-has-been-depreciated.patch -and -0002-need-transaction-translator.patch -should fix that. - -then simply "make && make install" - -might need to copy the api header file: -mkdir -p /usr/local/include/linux -sudo cp usb-vhci.h /usr/local/include/linux - - -BUILDING libusb_vhci --------------------- -git://usb-vhci.git.sourceforge.net/gitroot/usb-vhci/libusb_vhci - -This was a little more troublesome, but I didn't care to figure it out. -with libusb_vhci trunk (commit 5927f39a Sun Mar 27) - -add -0001-Comment-out-function-that-doesn-t-compile.patch -patch to remove that won't compile (and we don't use) -then: -cd src -gcc -c libusb_vhci.c -ar rcs libusb_vhci.a libusb_vhci.o -sudo cp libusb_vhci.a /usr/local/lib -mkdir -p /usr/local/include/linux -sudo cp libusb_vhci.h /usr/local/include/linux - -Gives us what we need diff --git a/examples/board_usb/at90usb162_cdc_loopback.c b/examples/board_usb/at90usb162_cdc_loopback.c deleted file mode 100644 index 738522f..0000000 --- a/examples/board_usb/at90usb162_cdc_loopback.c +++ /dev/null @@ -1,959 +0,0 @@ -/* vim: set sts=4:sw=4:ts=4:noexpandtab - * - * USB Serial Example for Teensy USB Development Board - * http://www.pjrc.com/teensy/usb_serial.html - * Copyright (c) 2008,2010,2011 PJRC.COM, LLC - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -// Version 1.0: Initial Release -// Version 1.1: support Teensy++ -// Version 1.2: fixed usb_serial_available -// Version 1.3: added transmit bandwidth test -// Version 1.4: added usb_serial_write -// Version 1.5: add support for Teensy 2.0 -// Version 1.6: fix zero length packet bug -// Version 1.7: fix usb_serial_set_control - -#define USB_SERIAL_PRIVATE_INCLUDE -#include "at90usb162_cdc_loopback.h" - -/************************************************************************** - * - * Configurable Options - * - **************************************************************************/ - -// You can change these to give your code its own name. On Windows, -// these are only used before an INF file (driver install) is loaded. -#define STR_MANUFACTURER L"Your Name" -#define STR_PRODUCT L"USB Serial" - -// All USB serial devices are supposed to have a serial number -// (according to Microsoft). On windows, a new COM port is created -// for every unique serial/vendor/product number combination. If -// you program 2 identical boards with 2 different serial numbers -// and they are assigned COM7 and COM8, each will always get the -// same COM port number because Windows remembers serial numbers. -// -// On Mac OS-X, a device file is created automatically which -// incorperates the serial number, eg, /dev/cu-usbmodem12341 -// -// Linux by default ignores the serial number, and creates device -// files named /dev/ttyACM0, /dev/ttyACM1... in the order connected. -// Udev rules (in /etc/udev/rules.d) can define persistent device -// names linked to this serial number, as well as permissions, owner -// and group settings. -#define STR_SERIAL_NUMBER L"12345" - -// Mac OS-X and Linux automatically load the correct drivers. On -// Windows, even though the driver is supplied by Microsoft, an -// INF file is needed to load the driver. These numbers need to -// match the INF file. -#define VENDOR_ID 0x16C0 -#define PRODUCT_ID 0x047A - -// When you write data, it goes into a USB endpoint buffer, which -// is transmitted to the PC when it becomes full, or after a timeout -// with no more writes. Even if you write in exactly packet-size -// increments, this timeout is used to send a "zero length packet" -// that tells the PC no more data is expected and it should pass -// any buffered data to the application that may be waiting. If -// you want data sent immediately, call usb_serial_flush_output(). -#define TRANSMIT_FLUSH_TIMEOUT 5 /* in milliseconds */ - -// If the PC is connected but not "listening", this is the length -// of time before usb_serial_getchar() returns with an error. This -// is roughly equivilant to a real UART simply transmitting the -// bits on a wire where nobody is listening, except you get an error -// code which you can ignore for serial-like discard of data, or -// use to know your data wasn't sent. -#define TRANSMIT_TIMEOUT 25 /* in milliseconds */ - -// USB devices are supposed to implment a halt feature, which is -// rarely (if ever) used. If you comment this line out, the halt -// code will be removed, saving 116 bytes of space (gcc 4.3.0). -// This is not strictly USB compliant, but works with all major -// operating systems. -#define SUPPORT_ENDPOINT_HALT - - - -/************************************************************************** - * - * Endpoint Buffer Configuration - * - **************************************************************************/ - -// These buffer sizes are best for most applications, but perhaps if you -// want more buffering on some endpoint at the expense of others, this -// is where you can make such changes. The AT90USB162 has only 176 bytes -// of DPRAM (USB buffers) and only endpoints 3 & 4 can double buffer. - -#define ENDPOINT0_SIZE 16 -#define CDC_ACM_ENDPOINT 2 -#define CDC_RX_ENDPOINT 3 -#define CDC_TX_ENDPOINT 4 -#if defined(__AVR_AT90USB162__) -#define CDC_ACM_SIZE 16 -#define CDC_ACM_BUFFER EP_SINGLE_BUFFER -#define CDC_RX_SIZE 32 -#define CDC_RX_BUFFER EP_DOUBLE_BUFFER -#define CDC_TX_SIZE 32 -#define CDC_TX_BUFFER EP_DOUBLE_BUFFER -#else -#define CDC_ACM_SIZE 16 -#define CDC_ACM_BUFFER EP_SINGLE_BUFFER -#define CDC_RX_SIZE 64 -#define CDC_RX_BUFFER EP_DOUBLE_BUFFER -#define CDC_TX_SIZE 64 -#define CDC_TX_BUFFER EP_DOUBLE_BUFFER -#endif - -static const uint8_t PROGMEM endpoint_config_table[] = { - 0, - 1, EP_TYPE_INTERRUPT_IN, EP_SIZE(CDC_ACM_SIZE) | CDC_ACM_BUFFER, - 1, EP_TYPE_BULK_OUT, EP_SIZE(CDC_RX_SIZE) | CDC_RX_BUFFER, - 1, EP_TYPE_BULK_IN, EP_SIZE(CDC_TX_SIZE) | CDC_TX_BUFFER -}; - - -/************************************************************************** - * - * Descriptor Data - * - **************************************************************************/ - -// Descriptors are the data that your computer reads when it auto-detects -// this USB device (called "enumeration" in USB lingo). The most commonly -// changed items are editable at the top of this file. Changing things -// in here should only be done by those who've read chapter 9 of the USB -// spec and relevant portions of any USB class specifications! - -static const uint8_t PROGMEM device_descriptor[] = { - 18, // bLength - 1, // bDescriptorType - 0x00, 0x02, // bcdUSB - 2, // bDeviceClass - 0, // bDeviceSubClass - 0, // bDeviceProtocol - ENDPOINT0_SIZE, // bMaxPacketSize0 - LSB(VENDOR_ID), MSB(VENDOR_ID), // idVendor - LSB(PRODUCT_ID), MSB(PRODUCT_ID), // idProduct - 0x00, 0x01, // bcdDevice - 1, // iManufacturer - 2, // iProduct - 3, // iSerialNumber - 1 // bNumConfigurations -}; - -#define CONFIG1_DESC_SIZE (9+9+5+5+4+5+7+9+7+7) -static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = { - // configuration descriptor, USB spec 9.6.3, page 264-266, Table 9-10 - 9, // bLength; - 2, // bDescriptorType; - LSB(CONFIG1_DESC_SIZE), // wTotalLength - MSB(CONFIG1_DESC_SIZE), - 2, // bNumInterfaces - 1, // bConfigurationValue - 0, // iConfiguration - 0xC0, // bmAttributes - 50, // bMaxPower - // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 - 9, // bLength - 4, // bDescriptorType - 0, // bInterfaceNumber - 0, // bAlternateSetting - 1, // bNumEndpoints - 0x02, // bInterfaceClass - 0x02, // bInterfaceSubClass - 0x01, // bInterfaceProtocol - 0, // iInterface - // CDC Header Functional Descriptor, CDC Spec 5.2.3.1, Table 26 - 5, // bFunctionLength - 0x24, // bDescriptorType - 0x00, // bDescriptorSubtype - 0x10, 0x01, // bcdCDC - // Call Management Functional Descriptor, CDC Spec 5.2.3.2, Table 27 - 5, // bFunctionLength - 0x24, // bDescriptorType - 0x01, // bDescriptorSubtype - 0x01, // bmCapabilities - 1, // bDataInterface - // Abstract Control Management Functional Descriptor, CDC Spec 5.2.3.3, Table 28 - 4, // bFunctionLength - 0x24, // bDescriptorType - 0x02, // bDescriptorSubtype - 0x06, // bmCapabilities - // Union Functional Descriptor, CDC Spec 5.2.3.8, Table 33 - 5, // bFunctionLength - 0x24, // bDescriptorType - 0x06, // bDescriptorSubtype - 0, // bMasterInterface - 1, // bSlaveInterface0 - // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 - 7, // bLength - 5, // bDescriptorType - CDC_ACM_ENDPOINT | 0x80, // bEndpointAddress - 0x03, // bmAttributes (0x03=intr) - CDC_ACM_SIZE, 0, // wMaxPacketSize - 64, // bInterval - // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 - 9, // bLength - 4, // bDescriptorType - 1, // bInterfaceNumber - 0, // bAlternateSetting - 2, // bNumEndpoints - 0x0A, // bInterfaceClass - 0x00, // bInterfaceSubClass - 0x00, // bInterfaceProtocol - 0, // iInterface - // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 - 7, // bLength - 5, // bDescriptorType - CDC_RX_ENDPOINT, // bEndpointAddress - 0x02, // bmAttributes (0x02=bulk) - CDC_RX_SIZE, 0, // wMaxPacketSize - 0, // bInterval - // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 - 7, // bLength - 5, // bDescriptorType - CDC_TX_ENDPOINT | 0x80, // bEndpointAddress - 0x02, // bmAttributes (0x02=bulk) - CDC_TX_SIZE, 0, // wMaxPacketSize - 0 // bInterval -}; - -// If you're desperate for a little extra code memory, these strings -// can be completely removed if iManufacturer, iProduct, iSerialNumber -// in the device desciptor are changed to zeros. -struct usb_string_descriptor_struct { - uint8_t bLength; - uint8_t bDescriptorType; - int16_t wString[]; -}; -static const struct usb_string_descriptor_struct PROGMEM string0 = { - 4, - 3, - {0x0409} -}; -static const struct usb_string_descriptor_struct PROGMEM string1 = { - sizeof(STR_MANUFACTURER), - 3, - STR_MANUFACTURER -}; -static const struct usb_string_descriptor_struct PROGMEM string2 = { - sizeof(STR_PRODUCT), - 3, - STR_PRODUCT -}; -static const struct usb_string_descriptor_struct PROGMEM string3 = { - sizeof(STR_SERIAL_NUMBER), - 3, - STR_SERIAL_NUMBER -}; - -// This table defines which descriptor data is sent for each specific -// request from the host (in wValue and wIndex). -static const struct descriptor_list_struct { - uint16_t wValue; - uint16_t wIndex; - const uint8_t *addr; - uint8_t length; -} PROGMEM descriptor_list[] = { - {0x0100, 0x0000, device_descriptor, sizeof(device_descriptor)}, - {0x0200, 0x0000, config1_descriptor, sizeof(config1_descriptor)}, - {0x0300, 0x0000, (const uint8_t *)&string0, 4}, - {0x0301, 0x0409, (const uint8_t *)&string1, sizeof(STR_MANUFACTURER)}, - {0x0302, 0x0409, (const uint8_t *)&string2, sizeof(STR_PRODUCT)}, - {0x0303, 0x0409, (const uint8_t *)&string3, sizeof(STR_SERIAL_NUMBER)} -}; -#define NUM_DESC_LIST (sizeof(descriptor_list)/sizeof(struct descriptor_list_struct)) - - -/************************************************************************** - * - * Variables - these are the only non-stack RAM usage - * - **************************************************************************/ - -// zero when we are not configured, non-zero when enumerated -static volatile uint8_t usb_configuration=0; - -// the time remaining before we transmit any partially full -// packet, or send a zero length packet. -static volatile uint8_t transmit_flush_timer=0; -static uint8_t transmit_previous_timeout=0; - -// serial port settings (baud rate, control signals, etc) set -// by the PC. These are ignored, but kept in RAM. -static uint8_t cdc_line_coding[7]={0x00, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x08}; -static uint8_t cdc_line_rtsdtr=0; - - -/************************************************************************** - * - * Public Functions - these are the API intended for the user - * - **************************************************************************/ - -// initialize USB serial -void usb_init(void) -{ - sei(); - HW_CONFIG(); - USB_FREEZE(); // enable USB - PLL_CONFIG(); // config PLL, 16 MHz xtal - while (!(PLLCSR & (1< size) write_size = size; - size -= write_size; - - // write the packet - switch (write_size) { - #if (CDC_TX_SIZE == 64) - case 64: UEDATX = *buffer++; - case 63: UEDATX = *buffer++; - case 62: UEDATX = *buffer++; - case 61: UEDATX = *buffer++; - case 60: UEDATX = *buffer++; - case 59: UEDATX = *buffer++; - case 58: UEDATX = *buffer++; - case 57: UEDATX = *buffer++; - case 56: UEDATX = *buffer++; - case 55: UEDATX = *buffer++; - case 54: UEDATX = *buffer++; - case 53: UEDATX = *buffer++; - case 52: UEDATX = *buffer++; - case 51: UEDATX = *buffer++; - case 50: UEDATX = *buffer++; - case 49: UEDATX = *buffer++; - case 48: UEDATX = *buffer++; - case 47: UEDATX = *buffer++; - case 46: UEDATX = *buffer++; - case 45: UEDATX = *buffer++; - case 44: UEDATX = *buffer++; - case 43: UEDATX = *buffer++; - case 42: UEDATX = *buffer++; - case 41: UEDATX = *buffer++; - case 40: UEDATX = *buffer++; - case 39: UEDATX = *buffer++; - case 38: UEDATX = *buffer++; - case 37: UEDATX = *buffer++; - case 36: UEDATX = *buffer++; - case 35: UEDATX = *buffer++; - case 34: UEDATX = *buffer++; - case 33: UEDATX = *buffer++; - #endif - #if (CDC_TX_SIZE >= 32) - case 32: UEDATX = *buffer++; - case 31: UEDATX = *buffer++; - case 30: UEDATX = *buffer++; - case 29: UEDATX = *buffer++; - case 28: UEDATX = *buffer++; - case 27: UEDATX = *buffer++; - case 26: UEDATX = *buffer++; - case 25: UEDATX = *buffer++; - case 24: UEDATX = *buffer++; - case 23: UEDATX = *buffer++; - case 22: UEDATX = *buffer++; - case 21: UEDATX = *buffer++; - case 20: UEDATX = *buffer++; - case 19: UEDATX = *buffer++; - case 18: UEDATX = *buffer++; - case 17: UEDATX = *buffer++; - #endif - #if (CDC_TX_SIZE >= 16) - case 16: UEDATX = *buffer++; - case 15: UEDATX = *buffer++; - case 14: UEDATX = *buffer++; - case 13: UEDATX = *buffer++; - case 12: UEDATX = *buffer++; - case 11: UEDATX = *buffer++; - case 10: UEDATX = *buffer++; - case 9: UEDATX = *buffer++; - #endif - case 8: UEDATX = *buffer++; - case 7: UEDATX = *buffer++; - case 6: UEDATX = *buffer++; - case 5: UEDATX = *buffer++; - case 4: UEDATX = *buffer++; - case 3: UEDATX = *buffer++; - case 2: UEDATX = *buffer++; - default: - case 1: UEDATX = *buffer++; - case 0: break; - } - // if this completed a packet, transmit it now! - if (!(UEINTX & (1<= NUM_DESC_LIST) { - UECONX = (1< desc_length) len = desc_length; - do { - // wait for host ready for IN packet - do { - i = UEINTX; - } while (!(i & ((1<= 1 && i <= MAX_ENDPOINT) { - usb_send_in(); - UENUM = i; - if (bRequest == SET_FEATURE) { - UECONX = (1< -static int dw_putchar(char __c, FILE *__stream) { DWDR = __c;(void)__stream; return __c;} -FILE dwout = FDEV_SETUP_STREAM(dw_putchar, NULL, _FDEV_SETUP_WRITE); -stdout=&dwout; -#endif - -// Very simple character echo test -int main(void) -{ - CPU_PRESCALE(0); - usb_init(); - while(usb_configured()==0); - while (1) { - int n = usb_serial_getchar(); - if (n >= 0) usb_serial_putchar(n); - } -} diff --git a/examples/board_usb/at90usb162_cdc_loopback.h b/examples/board_usb/at90usb162_cdc_loopback.h deleted file mode 100644 index 2d83706..0000000 --- a/examples/board_usb/at90usb162_cdc_loopback.h +++ /dev/null @@ -1,125 +0,0 @@ -/* vim: set sts=4:sw=4:ts=4:noexpandtab */ -#ifndef usb_serial_h__ -#define usb_serial_h__ - -#include - -// setup -void usb_init(void); // initialize everything -uint8_t usb_configured(void); // is the USB port configured - -// receiving data -int16_t usb_serial_getchar(void); // receive a character (-1 if timeout/error) -uint8_t usb_serial_available(void); // number of bytes in receive buffer -void usb_serial_flush_input(void); // discard any buffered input - -// transmitting data -int8_t usb_serial_putchar(uint8_t c); // transmit a character -int8_t usb_serial_putchar_nowait(uint8_t c); // transmit a character, do not wait -int8_t usb_serial_write(const uint8_t *buffer, uint16_t size); // transmit a buffer -void usb_serial_flush_output(void); // immediately transmit any buffered output - -// serial parameters -uint32_t usb_serial_get_baud(void); // get the baud rate -uint8_t usb_serial_get_stopbits(void); // get the number of stop bits -uint8_t usb_serial_get_paritytype(void);// get the parity type -uint8_t usb_serial_get_numbits(void); // get the number of data bits -uint8_t usb_serial_get_control(void); // get the RTS and DTR signal state -int8_t usb_serial_set_control(uint8_t signals); // set DSR, DCD, RI, etc - -// constants corresponding to the various serial parameters -#define USB_SERIAL_DTR 0x01 -#define USB_SERIAL_RTS 0x02 -#define USB_SERIAL_1_STOP 0 -#define USB_SERIAL_1_5_STOP 1 -#define USB_SERIAL_2_STOP 2 -#define USB_SERIAL_PARITY_NONE 0 -#define USB_SERIAL_PARITY_ODD 1 -#define USB_SERIAL_PARITY_EVEN 2 -#define USB_SERIAL_PARITY_MARK 3 -#define USB_SERIAL_PARITY_SPACE 4 -#define USB_SERIAL_DCD 0x01 -#define USB_SERIAL_DSR 0x02 -#define USB_SERIAL_BREAK 0x04 -#define USB_SERIAL_RI 0x08 -#define USB_SERIAL_FRAME_ERR 0x10 -#define USB_SERIAL_PARITY_ERR 0x20 -#define USB_SERIAL_OVERRUN_ERR 0x40 - -// This file does not include the HID debug functions, so these empty -// macros replace them with nothing, so users can compile code that -// has calls to these functions. -#define usb_debug_putchar(c) -#define usb_debug_flush_output() - - - -// Everything below this point is only intended for usb_serial.c -#ifdef USB_SERIAL_PRIVATE_INCLUDE -#include -#include -#include - -#define EP_TYPE_CONTROL 0x00 -#define EP_TYPE_BULK_IN 0x81 -#define EP_TYPE_BULK_OUT 0x80 -#define EP_TYPE_INTERRUPT_IN 0xC1 -#define EP_TYPE_INTERRUPT_OUT 0xC0 -#define EP_TYPE_ISOCHRONOUS_IN 0x41 -#define EP_TYPE_ISOCHRONOUS_OUT 0x40 -#define EP_SINGLE_BUFFER 0x02 -#define EP_DOUBLE_BUFFER 0x06 -#define EP_SIZE(s) ((s) == 64 ? 0x30 : \ - ((s) == 32 ? 0x20 : \ - ((s) == 16 ? 0x10 : \ - 0x00))) - -#define MAX_ENDPOINT 4 - -#define LSB(n) (n & 255) -#define MSB(n) ((n >> 8) & 255) - -#if defined(__AVR_AT90USB162__) -#define HW_CONFIG() -#define PLL_CONFIG() (PLLCSR = ((1< - - This file is part of simavr. - - simavr 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 - (at your option) any later version. - - simavr 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 simavr. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "sim_avr.h" -#include "avr_ioport.h" -#include "sim_elf.h" -#include "sim_hex.h" -#include "sim_gdb.h" -#include "vhci_usb.h" -#include "sim_vcd_file.h" - -struct vhci_usb_t vhci_usb; -avr_t * avr = NULL; -avr_vcd_t vcd_file; - - - -char avr_flash_path[1024]; -int avr_flash_fd = 0; - -// avr special flash initalization -// here: open and map a file to enable a persistent storage for the flash memory -void avr_special_init( avr_t* avr) -{ - //puts(" --=== INIT CALLED ===--"); - // release flash memory if allocated - if(avr->flash) free(avr->flash); - // open the file - avr_flash_fd = open(avr_flash_path, O_RDWR|O_CREAT, 0644); - if (avr_flash_fd < 0) { - perror(avr_flash_path); - exit(1); - } - // resize and map the file the file - (void)ftruncate(avr_flash_fd, avr->flashend + 1); - avr->flash = (uint8_t*)mmap(NULL, avr->flashend + 1, // 32k is multiple of 4096 - PROT_READ|PROT_WRITE, MAP_SHARED, avr_flash_fd, 0); - if (!avr->flash) { - fprintf(stderr, "unable to map memory\n"); - perror(avr_flash_path); - exit(1); - } -} - -// avr special flash deinitalization -// here: cleanup the persistent storage -void avr_special_deinit( avr_t* avr) -{ - //puts(" --=== DEINIT CALLED ===--"); - // unmap and close the file - munmap( avr->flash, avr->flashend + 1); - close( avr_flash_fd); - // signal that cleanup is done - avr->flash = NULL; -} - -int main(int argc, char *argv[]) -{ -// elf_firmware_t f; - const char * pwd = dirname(argv[0]); - - avr = avr_make_mcu_by_name("at90usb162"); - if (!avr) { - fprintf(stderr, "%s: Error creating the AVR core\n", argv[0]); - exit(1); - } - strcpy(avr_flash_path, "simusb_flash.bin"); - // register our own functions - avr->special_init = avr_special_init; - avr->special_deinit = avr_special_deinit; - //avr->reset = NULL; - avr_init(avr); - avr->frequency = 8000000; - - // this trick creates a file that contains /and keep/ the flash - // in the same state as it was before. This allow the bootloader - // app to be kept, and re-run if the bootloader doesn't get a - // new one - { - char path[1024]; - uint32_t base, size; - snprintf(path, sizeof(path), "%s/../%s", pwd, "at90usb162_cdc_loopback.hex"); - - uint8_t * boot = read_ihex_file(path, &size, &base); - if (!boot) { - fprintf(stderr, "%s: Unable to load %s\n", argv[0], path); - exit(1); - } - printf("Booloader %04x: %d\n", base, size); - memcpy(avr->flash + base, boot, size); - free(boot); - avr->pc = base; - avr->codeend = avr->flashend; - } - - // even if not setup at startup, activate gdb if crashing - avr->gdb_port = 1234; - if (0) { - //avr->state = cpu_Stopped; - avr_gdb_init(avr); - } - - vhci_usb_init(avr, &vhci_usb); - vhci_usb_connect(&vhci_usb, '0'); - - - while (1) { - avr_run(avr); - } -} diff --git a/examples/extra_board_usb/.gitignore b/examples/extra_board_usb/.gitignore new file mode 100644 index 0000000..04e1d75 --- /dev/null +++ b/examples/extra_board_usb/.gitignore @@ -0,0 +1 @@ +simusb_flash.bin diff --git a/examples/extra_board_usb/Makefile b/examples/extra_board_usb/Makefile new file mode 100644 index 0000000..f7f668e --- /dev/null +++ b/examples/extra_board_usb/Makefile @@ -0,0 +1,61 @@ +# +# Copyright 2012 Torbjorn Tyridal +# +# This file is part of simavr. +# +# simavr 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 +# (at your option) any later version. +# +# simavr 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 simavr. If not, see . + +target= simusb +firm_src = at90usb162_cdc_loopback.c +firmware = ${firm_src:.c=.hex} +simavr = ../../ + +IPATH = . +IPATH += ../parts +IPATH += ../vhci/include +IPATH += ../vhci +IPATH += ${simavr}/include +IPATH += ${simavr}/simavr/sim +#IPATH += /usr/local/include + +VPATH = . +VPATH += ../parts + +LDFLAGS += -lpthread -lusb_vhci -L../vhci/lib + +all: obj ${firmware} ${target} + +include ${simavr}/Makefile.common + +board = ${OBJ}/${target}.elf + +${board} : ${OBJ}/vhci_usb.o +${board} : ${OBJ}/${target}.o + +../vhci/lib/libusb_vhci.a: + @echo -n "BUILDIN $@ " + @{ export CC=;export CFLAGS=; $(MAKE) -j -C ../vhci >/tmp/vhci.build.log 2>&1 || \ + { echo "ERROR check /tmp/vhci.build.log"; exit 1; }; } && \ + echo " Done" + +vhci : ../vhci/lib/libusb_vhci.a + +clean-vhci: + $(MAKE) -C ../vhci clean + +${target}: vhci ${board} + @echo $@ done + +clean: clean-${OBJ} clean-vhci + rm -rf *.a *.axf *.hex ${target} *.vcd diff --git a/examples/extra_board_usb/README b/examples/extra_board_usb/README new file mode 100644 index 0000000..0db5550 --- /dev/null +++ b/examples/extra_board_usb/README @@ -0,0 +1,45 @@ +This will bridge the usb avr to the vhci-usb virtual usb host. + +You'll need vhci-usb and vhci-usb-lib to build and use it. +(http://sourceforge.net/projects/usb-vhci/) + +When setup, your avr project will connect to the linux usb system +as a real device. + +BUILDING usb-vhci +----------------- +git://usb-vhci.git.sourceforge.net/gitroot/usb-vhci/vhci_hcd + +The driver doesn't compile on recent linux kernels. +(commit 203800f0 Mon Apr 4) +0001-SPIN_LOCK_UNLOCKED-has-been-depreciated.patch +and +0002-need-transaction-translator.patch +should fix that. + +then simply "make && make install" + +might need to copy the api header file: +mkdir -p /usr/local/include/linux +sudo cp usb-vhci.h /usr/local/include/linux + + +BUILDING libusb_vhci +-------------------- +git://usb-vhci.git.sourceforge.net/gitroot/usb-vhci/libusb_vhci + +This was a little more troublesome, but I didn't care to figure it out. +with libusb_vhci trunk (commit 5927f39a Sun Mar 27) + +add +0001-Comment-out-function-that-doesn-t-compile.patch +patch to remove that won't compile (and we don't use) +then: +cd src +gcc -c libusb_vhci.c +ar rcs libusb_vhci.a libusb_vhci.o +sudo cp libusb_vhci.a /usr/local/lib +mkdir -p /usr/local/include/linux +sudo cp libusb_vhci.h /usr/local/include/linux + +Gives us what we need diff --git a/examples/extra_board_usb/at90usb162_cdc_loopback.c b/examples/extra_board_usb/at90usb162_cdc_loopback.c new file mode 100644 index 0000000..738522f --- /dev/null +++ b/examples/extra_board_usb/at90usb162_cdc_loopback.c @@ -0,0 +1,959 @@ +/* vim: set sts=4:sw=4:ts=4:noexpandtab + * + * USB Serial Example for Teensy USB Development Board + * http://www.pjrc.com/teensy/usb_serial.html + * Copyright (c) 2008,2010,2011 PJRC.COM, LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +// Version 1.0: Initial Release +// Version 1.1: support Teensy++ +// Version 1.2: fixed usb_serial_available +// Version 1.3: added transmit bandwidth test +// Version 1.4: added usb_serial_write +// Version 1.5: add support for Teensy 2.0 +// Version 1.6: fix zero length packet bug +// Version 1.7: fix usb_serial_set_control + +#define USB_SERIAL_PRIVATE_INCLUDE +#include "at90usb162_cdc_loopback.h" + +/************************************************************************** + * + * Configurable Options + * + **************************************************************************/ + +// You can change these to give your code its own name. On Windows, +// these are only used before an INF file (driver install) is loaded. +#define STR_MANUFACTURER L"Your Name" +#define STR_PRODUCT L"USB Serial" + +// All USB serial devices are supposed to have a serial number +// (according to Microsoft). On windows, a new COM port is created +// for every unique serial/vendor/product number combination. If +// you program 2 identical boards with 2 different serial numbers +// and they are assigned COM7 and COM8, each will always get the +// same COM port number because Windows remembers serial numbers. +// +// On Mac OS-X, a device file is created automatically which +// incorperates the serial number, eg, /dev/cu-usbmodem12341 +// +// Linux by default ignores the serial number, and creates device +// files named /dev/ttyACM0, /dev/ttyACM1... in the order connected. +// Udev rules (in /etc/udev/rules.d) can define persistent device +// names linked to this serial number, as well as permissions, owner +// and group settings. +#define STR_SERIAL_NUMBER L"12345" + +// Mac OS-X and Linux automatically load the correct drivers. On +// Windows, even though the driver is supplied by Microsoft, an +// INF file is needed to load the driver. These numbers need to +// match the INF file. +#define VENDOR_ID 0x16C0 +#define PRODUCT_ID 0x047A + +// When you write data, it goes into a USB endpoint buffer, which +// is transmitted to the PC when it becomes full, or after a timeout +// with no more writes. Even if you write in exactly packet-size +// increments, this timeout is used to send a "zero length packet" +// that tells the PC no more data is expected and it should pass +// any buffered data to the application that may be waiting. If +// you want data sent immediately, call usb_serial_flush_output(). +#define TRANSMIT_FLUSH_TIMEOUT 5 /* in milliseconds */ + +// If the PC is connected but not "listening", this is the length +// of time before usb_serial_getchar() returns with an error. This +// is roughly equivilant to a real UART simply transmitting the +// bits on a wire where nobody is listening, except you get an error +// code which you can ignore for serial-like discard of data, or +// use to know your data wasn't sent. +#define TRANSMIT_TIMEOUT 25 /* in milliseconds */ + +// USB devices are supposed to implment a halt feature, which is +// rarely (if ever) used. If you comment this line out, the halt +// code will be removed, saving 116 bytes of space (gcc 4.3.0). +// This is not strictly USB compliant, but works with all major +// operating systems. +#define SUPPORT_ENDPOINT_HALT + + + +/************************************************************************** + * + * Endpoint Buffer Configuration + * + **************************************************************************/ + +// These buffer sizes are best for most applications, but perhaps if you +// want more buffering on some endpoint at the expense of others, this +// is where you can make such changes. The AT90USB162 has only 176 bytes +// of DPRAM (USB buffers) and only endpoints 3 & 4 can double buffer. + +#define ENDPOINT0_SIZE 16 +#define CDC_ACM_ENDPOINT 2 +#define CDC_RX_ENDPOINT 3 +#define CDC_TX_ENDPOINT 4 +#if defined(__AVR_AT90USB162__) +#define CDC_ACM_SIZE 16 +#define CDC_ACM_BUFFER EP_SINGLE_BUFFER +#define CDC_RX_SIZE 32 +#define CDC_RX_BUFFER EP_DOUBLE_BUFFER +#define CDC_TX_SIZE 32 +#define CDC_TX_BUFFER EP_DOUBLE_BUFFER +#else +#define CDC_ACM_SIZE 16 +#define CDC_ACM_BUFFER EP_SINGLE_BUFFER +#define CDC_RX_SIZE 64 +#define CDC_RX_BUFFER EP_DOUBLE_BUFFER +#define CDC_TX_SIZE 64 +#define CDC_TX_BUFFER EP_DOUBLE_BUFFER +#endif + +static const uint8_t PROGMEM endpoint_config_table[] = { + 0, + 1, EP_TYPE_INTERRUPT_IN, EP_SIZE(CDC_ACM_SIZE) | CDC_ACM_BUFFER, + 1, EP_TYPE_BULK_OUT, EP_SIZE(CDC_RX_SIZE) | CDC_RX_BUFFER, + 1, EP_TYPE_BULK_IN, EP_SIZE(CDC_TX_SIZE) | CDC_TX_BUFFER +}; + + +/************************************************************************** + * + * Descriptor Data + * + **************************************************************************/ + +// Descriptors are the data that your computer reads when it auto-detects +// this USB device (called "enumeration" in USB lingo). The most commonly +// changed items are editable at the top of this file. Changing things +// in here should only be done by those who've read chapter 9 of the USB +// spec and relevant portions of any USB class specifications! + +static const uint8_t PROGMEM device_descriptor[] = { + 18, // bLength + 1, // bDescriptorType + 0x00, 0x02, // bcdUSB + 2, // bDeviceClass + 0, // bDeviceSubClass + 0, // bDeviceProtocol + ENDPOINT0_SIZE, // bMaxPacketSize0 + LSB(VENDOR_ID), MSB(VENDOR_ID), // idVendor + LSB(PRODUCT_ID), MSB(PRODUCT_ID), // idProduct + 0x00, 0x01, // bcdDevice + 1, // iManufacturer + 2, // iProduct + 3, // iSerialNumber + 1 // bNumConfigurations +}; + +#define CONFIG1_DESC_SIZE (9+9+5+5+4+5+7+9+7+7) +static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = { + // configuration descriptor, USB spec 9.6.3, page 264-266, Table 9-10 + 9, // bLength; + 2, // bDescriptorType; + LSB(CONFIG1_DESC_SIZE), // wTotalLength + MSB(CONFIG1_DESC_SIZE), + 2, // bNumInterfaces + 1, // bConfigurationValue + 0, // iConfiguration + 0xC0, // bmAttributes + 50, // bMaxPower + // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 + 9, // bLength + 4, // bDescriptorType + 0, // bInterfaceNumber + 0, // bAlternateSetting + 1, // bNumEndpoints + 0x02, // bInterfaceClass + 0x02, // bInterfaceSubClass + 0x01, // bInterfaceProtocol + 0, // iInterface + // CDC Header Functional Descriptor, CDC Spec 5.2.3.1, Table 26 + 5, // bFunctionLength + 0x24, // bDescriptorType + 0x00, // bDescriptorSubtype + 0x10, 0x01, // bcdCDC + // Call Management Functional Descriptor, CDC Spec 5.2.3.2, Table 27 + 5, // bFunctionLength + 0x24, // bDescriptorType + 0x01, // bDescriptorSubtype + 0x01, // bmCapabilities + 1, // bDataInterface + // Abstract Control Management Functional Descriptor, CDC Spec 5.2.3.3, Table 28 + 4, // bFunctionLength + 0x24, // bDescriptorType + 0x02, // bDescriptorSubtype + 0x06, // bmCapabilities + // Union Functional Descriptor, CDC Spec 5.2.3.8, Table 33 + 5, // bFunctionLength + 0x24, // bDescriptorType + 0x06, // bDescriptorSubtype + 0, // bMasterInterface + 1, // bSlaveInterface0 + // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 + 7, // bLength + 5, // bDescriptorType + CDC_ACM_ENDPOINT | 0x80, // bEndpointAddress + 0x03, // bmAttributes (0x03=intr) + CDC_ACM_SIZE, 0, // wMaxPacketSize + 64, // bInterval + // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 + 9, // bLength + 4, // bDescriptorType + 1, // bInterfaceNumber + 0, // bAlternateSetting + 2, // bNumEndpoints + 0x0A, // bInterfaceClass + 0x00, // bInterfaceSubClass + 0x00, // bInterfaceProtocol + 0, // iInterface + // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 + 7, // bLength + 5, // bDescriptorType + CDC_RX_ENDPOINT, // bEndpointAddress + 0x02, // bmAttributes (0x02=bulk) + CDC_RX_SIZE, 0, // wMaxPacketSize + 0, // bInterval + // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 + 7, // bLength + 5, // bDescriptorType + CDC_TX_ENDPOINT | 0x80, // bEndpointAddress + 0x02, // bmAttributes (0x02=bulk) + CDC_TX_SIZE, 0, // wMaxPacketSize + 0 // bInterval +}; + +// If you're desperate for a little extra code memory, these strings +// can be completely removed if iManufacturer, iProduct, iSerialNumber +// in the device desciptor are changed to zeros. +struct usb_string_descriptor_struct { + uint8_t bLength; + uint8_t bDescriptorType; + int16_t wString[]; +}; +static const struct usb_string_descriptor_struct PROGMEM string0 = { + 4, + 3, + {0x0409} +}; +static const struct usb_string_descriptor_struct PROGMEM string1 = { + sizeof(STR_MANUFACTURER), + 3, + STR_MANUFACTURER +}; +static const struct usb_string_descriptor_struct PROGMEM string2 = { + sizeof(STR_PRODUCT), + 3, + STR_PRODUCT +}; +static const struct usb_string_descriptor_struct PROGMEM string3 = { + sizeof(STR_SERIAL_NUMBER), + 3, + STR_SERIAL_NUMBER +}; + +// This table defines which descriptor data is sent for each specific +// request from the host (in wValue and wIndex). +static const struct descriptor_list_struct { + uint16_t wValue; + uint16_t wIndex; + const uint8_t *addr; + uint8_t length; +} PROGMEM descriptor_list[] = { + {0x0100, 0x0000, device_descriptor, sizeof(device_descriptor)}, + {0x0200, 0x0000, config1_descriptor, sizeof(config1_descriptor)}, + {0x0300, 0x0000, (const uint8_t *)&string0, 4}, + {0x0301, 0x0409, (const uint8_t *)&string1, sizeof(STR_MANUFACTURER)}, + {0x0302, 0x0409, (const uint8_t *)&string2, sizeof(STR_PRODUCT)}, + {0x0303, 0x0409, (const uint8_t *)&string3, sizeof(STR_SERIAL_NUMBER)} +}; +#define NUM_DESC_LIST (sizeof(descriptor_list)/sizeof(struct descriptor_list_struct)) + + +/************************************************************************** + * + * Variables - these are the only non-stack RAM usage + * + **************************************************************************/ + +// zero when we are not configured, non-zero when enumerated +static volatile uint8_t usb_configuration=0; + +// the time remaining before we transmit any partially full +// packet, or send a zero length packet. +static volatile uint8_t transmit_flush_timer=0; +static uint8_t transmit_previous_timeout=0; + +// serial port settings (baud rate, control signals, etc) set +// by the PC. These are ignored, but kept in RAM. +static uint8_t cdc_line_coding[7]={0x00, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x08}; +static uint8_t cdc_line_rtsdtr=0; + + +/************************************************************************** + * + * Public Functions - these are the API intended for the user + * + **************************************************************************/ + +// initialize USB serial +void usb_init(void) +{ + sei(); + HW_CONFIG(); + USB_FREEZE(); // enable USB + PLL_CONFIG(); // config PLL, 16 MHz xtal + while (!(PLLCSR & (1< size) write_size = size; + size -= write_size; + + // write the packet + switch (write_size) { + #if (CDC_TX_SIZE == 64) + case 64: UEDATX = *buffer++; + case 63: UEDATX = *buffer++; + case 62: UEDATX = *buffer++; + case 61: UEDATX = *buffer++; + case 60: UEDATX = *buffer++; + case 59: UEDATX = *buffer++; + case 58: UEDATX = *buffer++; + case 57: UEDATX = *buffer++; + case 56: UEDATX = *buffer++; + case 55: UEDATX = *buffer++; + case 54: UEDATX = *buffer++; + case 53: UEDATX = *buffer++; + case 52: UEDATX = *buffer++; + case 51: UEDATX = *buffer++; + case 50: UEDATX = *buffer++; + case 49: UEDATX = *buffer++; + case 48: UEDATX = *buffer++; + case 47: UEDATX = *buffer++; + case 46: UEDATX = *buffer++; + case 45: UEDATX = *buffer++; + case 44: UEDATX = *buffer++; + case 43: UEDATX = *buffer++; + case 42: UEDATX = *buffer++; + case 41: UEDATX = *buffer++; + case 40: UEDATX = *buffer++; + case 39: UEDATX = *buffer++; + case 38: UEDATX = *buffer++; + case 37: UEDATX = *buffer++; + case 36: UEDATX = *buffer++; + case 35: UEDATX = *buffer++; + case 34: UEDATX = *buffer++; + case 33: UEDATX = *buffer++; + #endif + #if (CDC_TX_SIZE >= 32) + case 32: UEDATX = *buffer++; + case 31: UEDATX = *buffer++; + case 30: UEDATX = *buffer++; + case 29: UEDATX = *buffer++; + case 28: UEDATX = *buffer++; + case 27: UEDATX = *buffer++; + case 26: UEDATX = *buffer++; + case 25: UEDATX = *buffer++; + case 24: UEDATX = *buffer++; + case 23: UEDATX = *buffer++; + case 22: UEDATX = *buffer++; + case 21: UEDATX = *buffer++; + case 20: UEDATX = *buffer++; + case 19: UEDATX = *buffer++; + case 18: UEDATX = *buffer++; + case 17: UEDATX = *buffer++; + #endif + #if (CDC_TX_SIZE >= 16) + case 16: UEDATX = *buffer++; + case 15: UEDATX = *buffer++; + case 14: UEDATX = *buffer++; + case 13: UEDATX = *buffer++; + case 12: UEDATX = *buffer++; + case 11: UEDATX = *buffer++; + case 10: UEDATX = *buffer++; + case 9: UEDATX = *buffer++; + #endif + case 8: UEDATX = *buffer++; + case 7: UEDATX = *buffer++; + case 6: UEDATX = *buffer++; + case 5: UEDATX = *buffer++; + case 4: UEDATX = *buffer++; + case 3: UEDATX = *buffer++; + case 2: UEDATX = *buffer++; + default: + case 1: UEDATX = *buffer++; + case 0: break; + } + // if this completed a packet, transmit it now! + if (!(UEINTX & (1<= NUM_DESC_LIST) { + UECONX = (1< desc_length) len = desc_length; + do { + // wait for host ready for IN packet + do { + i = UEINTX; + } while (!(i & ((1<= 1 && i <= MAX_ENDPOINT) { + usb_send_in(); + UENUM = i; + if (bRequest == SET_FEATURE) { + UECONX = (1< +static int dw_putchar(char __c, FILE *__stream) { DWDR = __c;(void)__stream; return __c;} +FILE dwout = FDEV_SETUP_STREAM(dw_putchar, NULL, _FDEV_SETUP_WRITE); +stdout=&dwout; +#endif + +// Very simple character echo test +int main(void) +{ + CPU_PRESCALE(0); + usb_init(); + while(usb_configured()==0); + while (1) { + int n = usb_serial_getchar(); + if (n >= 0) usb_serial_putchar(n); + } +} diff --git a/examples/extra_board_usb/at90usb162_cdc_loopback.h b/examples/extra_board_usb/at90usb162_cdc_loopback.h new file mode 100644 index 0000000..2d83706 --- /dev/null +++ b/examples/extra_board_usb/at90usb162_cdc_loopback.h @@ -0,0 +1,125 @@ +/* vim: set sts=4:sw=4:ts=4:noexpandtab */ +#ifndef usb_serial_h__ +#define usb_serial_h__ + +#include + +// setup +void usb_init(void); // initialize everything +uint8_t usb_configured(void); // is the USB port configured + +// receiving data +int16_t usb_serial_getchar(void); // receive a character (-1 if timeout/error) +uint8_t usb_serial_available(void); // number of bytes in receive buffer +void usb_serial_flush_input(void); // discard any buffered input + +// transmitting data +int8_t usb_serial_putchar(uint8_t c); // transmit a character +int8_t usb_serial_putchar_nowait(uint8_t c); // transmit a character, do not wait +int8_t usb_serial_write(const uint8_t *buffer, uint16_t size); // transmit a buffer +void usb_serial_flush_output(void); // immediately transmit any buffered output + +// serial parameters +uint32_t usb_serial_get_baud(void); // get the baud rate +uint8_t usb_serial_get_stopbits(void); // get the number of stop bits +uint8_t usb_serial_get_paritytype(void);// get the parity type +uint8_t usb_serial_get_numbits(void); // get the number of data bits +uint8_t usb_serial_get_control(void); // get the RTS and DTR signal state +int8_t usb_serial_set_control(uint8_t signals); // set DSR, DCD, RI, etc + +// constants corresponding to the various serial parameters +#define USB_SERIAL_DTR 0x01 +#define USB_SERIAL_RTS 0x02 +#define USB_SERIAL_1_STOP 0 +#define USB_SERIAL_1_5_STOP 1 +#define USB_SERIAL_2_STOP 2 +#define USB_SERIAL_PARITY_NONE 0 +#define USB_SERIAL_PARITY_ODD 1 +#define USB_SERIAL_PARITY_EVEN 2 +#define USB_SERIAL_PARITY_MARK 3 +#define USB_SERIAL_PARITY_SPACE 4 +#define USB_SERIAL_DCD 0x01 +#define USB_SERIAL_DSR 0x02 +#define USB_SERIAL_BREAK 0x04 +#define USB_SERIAL_RI 0x08 +#define USB_SERIAL_FRAME_ERR 0x10 +#define USB_SERIAL_PARITY_ERR 0x20 +#define USB_SERIAL_OVERRUN_ERR 0x40 + +// This file does not include the HID debug functions, so these empty +// macros replace them with nothing, so users can compile code that +// has calls to these functions. +#define usb_debug_putchar(c) +#define usb_debug_flush_output() + + + +// Everything below this point is only intended for usb_serial.c +#ifdef USB_SERIAL_PRIVATE_INCLUDE +#include +#include +#include + +#define EP_TYPE_CONTROL 0x00 +#define EP_TYPE_BULK_IN 0x81 +#define EP_TYPE_BULK_OUT 0x80 +#define EP_TYPE_INTERRUPT_IN 0xC1 +#define EP_TYPE_INTERRUPT_OUT 0xC0 +#define EP_TYPE_ISOCHRONOUS_IN 0x41 +#define EP_TYPE_ISOCHRONOUS_OUT 0x40 +#define EP_SINGLE_BUFFER 0x02 +#define EP_DOUBLE_BUFFER 0x06 +#define EP_SIZE(s) ((s) == 64 ? 0x30 : \ + ((s) == 32 ? 0x20 : \ + ((s) == 16 ? 0x10 : \ + 0x00))) + +#define MAX_ENDPOINT 4 + +#define LSB(n) (n & 255) +#define MSB(n) ((n >> 8) & 255) + +#if defined(__AVR_AT90USB162__) +#define HW_CONFIG() +#define PLL_CONFIG() (PLLCSR = ((1< + + This file is part of simavr. + + simavr 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 + (at your option) any later version. + + simavr 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 simavr. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "sim_avr.h" +#include "avr_ioport.h" +#include "sim_elf.h" +#include "sim_hex.h" +#include "sim_gdb.h" +#include "vhci_usb.h" +#include "sim_vcd_file.h" + +struct vhci_usb_t vhci_usb; +avr_t * avr = NULL; +avr_vcd_t vcd_file; + + + +char avr_flash_path[1024]; +int avr_flash_fd = 0; + +// avr special flash initalization +// here: open and map a file to enable a persistent storage for the flash memory +void avr_special_init( avr_t* avr) +{ + //puts(" --=== INIT CALLED ===--"); + // release flash memory if allocated + if(avr->flash) free(avr->flash); + // open the file + avr_flash_fd = open(avr_flash_path, O_RDWR|O_CREAT, 0644); + if (avr_flash_fd < 0) { + perror(avr_flash_path); + exit(1); + } + // resize and map the file the file + (void)ftruncate(avr_flash_fd, avr->flashend + 1); + avr->flash = (uint8_t*)mmap(NULL, avr->flashend + 1, // 32k is multiple of 4096 + PROT_READ|PROT_WRITE, MAP_SHARED, avr_flash_fd, 0); + if (!avr->flash) { + fprintf(stderr, "unable to map memory\n"); + perror(avr_flash_path); + exit(1); + } +} + +// avr special flash deinitalization +// here: cleanup the persistent storage +void avr_special_deinit( avr_t* avr) +{ + //puts(" --=== DEINIT CALLED ===--"); + // unmap and close the file + munmap( avr->flash, avr->flashend + 1); + close( avr_flash_fd); + // signal that cleanup is done + avr->flash = NULL; +} + +int main(int argc, char *argv[]) +{ +// elf_firmware_t f; + const char * pwd = dirname(argv[0]); + + avr = avr_make_mcu_by_name("at90usb162"); + if (!avr) { + fprintf(stderr, "%s: Error creating the AVR core\n", argv[0]); + exit(1); + } + strcpy(avr_flash_path, "simusb_flash.bin"); + // register our own functions + avr->special_init = avr_special_init; + avr->special_deinit = avr_special_deinit; + //avr->reset = NULL; + avr_init(avr); + avr->frequency = 8000000; + + // this trick creates a file that contains /and keep/ the flash + // in the same state as it was before. This allow the bootloader + // app to be kept, and re-run if the bootloader doesn't get a + // new one + { + char path[1024]; + uint32_t base, size; + snprintf(path, sizeof(path), "%s/../%s", pwd, "at90usb162_cdc_loopback.hex"); + + uint8_t * boot = read_ihex_file(path, &size, &base); + if (!boot) { + fprintf(stderr, "%s: Unable to load %s\n", argv[0], path); + exit(1); + } + printf("Booloader %04x: %d\n", base, size); + memcpy(avr->flash + base, boot, size); + free(boot); + avr->pc = base; + avr->codeend = avr->flashend; + } + + // even if not setup at startup, activate gdb if crashing + avr->gdb_port = 1234; + if (0) { + //avr->state = cpu_Stopped; + avr_gdb_init(avr); + } + + vhci_usb_init(avr, &vhci_usb); + vhci_usb_connect(&vhci_usb, '0'); + + + while (1) { + avr_run(avr); + } +}