From da03595c32f3822d0b8c96ab61ec7b65131196ee Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Thu, 27 Oct 2011 10:23:06 -0400 Subject: brought nuevo_diskloader changes over to diskloader Moved nuevo_diskloader files into diskloader directory. Changed back to real PID for Leonardo --- bootloaders/diskloader/src/Platform.h | 63 ++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 20 deletions(-) (limited to 'bootloaders/diskloader/src/Platform.h') diff --git a/bootloaders/diskloader/src/Platform.h b/bootloaders/diskloader/src/Platform.h index 6acbf39..4b58f9f 100644 --- a/bootloaders/diskloader/src/Platform.h +++ b/bootloaders/diskloader/src/Platform.h @@ -1,3 +1,9 @@ +/* + * Platform.h + */ + +#ifndef __PLATFORM_H__ +#define __PLATFORM_H__ #include #include @@ -11,39 +17,56 @@ #include #include +#ifdef __cplusplus +extern "C"{ +#endif + typedef unsigned char u8; typedef unsigned short u16; typedef unsigned long u32; - -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define DISABLE_JTAG() MCUCR = (1 << JTD) | (1 << IVCE) | (0 << PUD); MCUCR = (1 << JTD) | (0 << IVSEL) | (0 << IVCE) | (0 << PUD); +#define CDC_ENABLED #define USB_PID_LEONARDO 0x0034 #define USB_PID_MICRO 0x0035 #define USB_VID 0x2341 // arduino LLC vid #define USB_PID ARDUINO_MODEL_PID // passed in by Makefile - 0x0034 for Leonardo, 0x0035 for MIcro -#define OEM_NAME 'l','e','o','n','a','r','d','o' // 8 chars -#define BOARD_INIT() DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5); CPU_PRESCALE(0); DISABLE_JTAG(); -#define LED0 PORTC &= ~(1<<7) -#define LED1 PORTC |= (1<<7) -#define TXLED0 PORTD |= (1<<5) -#define TXLED1 PORTD &= ~(1<<5) -#define RXLED0 PORTB |= (1<<0) -#define RXLED1 PORTB &= ~(1<<0) +//#include "USBDesc.h" +//#include "../../../cores/arduino/USBCore.h" -#define TRANSFER_PGM 0x80 -#define TRANSFER_RELEASE 0x40 -#define TRANSFER_ZERO 0x20 -void Transfer(u8 ep, const u8* data, int len); -void Recv(u8 ep, u8* dst, u8 len); -void Program(u8 ep, u16 page, u8 count); +#define min(a,b) ((a)<(b)?(a):(b)) -#define CDC_ENABLED +#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) +#define DISABLE_JTAG() MCUCR = (1 << JTD) | (1 << IVCE) | (0 << PUD); MCUCR = (1 << JTD) | (0 << IVSEL) | (0 << IVCE) | (0 << PUD) -#include "USBCore.h" -#include "USBDesc.h" +#define BOARD_INIT() DDRC |= (1<<7); DDRB |= (1<<0); DDRE |= (1<<6); CPU_PRESCALE(0); DISABLE_JTAG(); // for XXX-series boards +//#define BOARD_INIT() DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5); CPU_PRESCALE(0); DISABLE_JTAG(); // for non-XXX boards + +// for XXX-series boards +#define TX_LED_OFF() PORTE |= (1<<6) +#define TX_LED_ON() PORTE &= ~(1<<6) +#define RX_LED_OFF() PORTB |= (1<<0) +#define RX_LED_ON() PORTB &= ~(1<<0) +#define L_LED_OFF() PORTC &= ~(1<<7) +#define L_LED_ON() PORTC |= (1<<7) +#define L_LED_TOGGLE() PORTC ^= (1<<7) +// these for non-XXX boards +//#define LED0 PORTC &= ~(1<<7) +//#define LED1 PORTC |= (1<<7) +//#define TXLED0 PORTD |= (1<<5) +//#define TXLED1 PORTD &= ~(1<<5) +//#define RXLED0 PORTB |= (1<<0) +//#define RXLED1 PORTB &= ~(1<<0) + +#ifdef __cplusplus +} /* extern "C"{ */ +#endif + +#include "USBDesc.h" +#include "USBCore.h" +#include "USBAPI.h" +#endif /* __PLATFORM_H__ */ -- cgit v1.2.3-18-g5258