github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CHG: appmain now calls cmd_recieve as it should

Browse source 
CHG: flasher -  removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client,  wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes.  usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
This commit is contained in:
iceman1001 2017-10-17 20:58:17 +02:00
commit 16028f7d33
9 changed files with 279 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

12
armsrc/appmain.c
View file

@ -1161,20 +1161,12 @@ void __attribute__((noreturn)) AppMain(void) {
#endif #endif
byte_t rx[sizeof(UsbCommand)]; byte_t rx[sizeof(UsbCommand)];
size_t rx_len = 0;
for(;;) { for(;;) {
// Check if there is a usb packet available // Check if there is a usb packet available
if ( usb_poll_validate_length() ) { if ( cmd_receive( (UsbCommand*)rx ) )
UsbPacketReceived(rx, sizeof(UsbCommand) );
// Try to retrieve the available command frame
rx_len = usb_read(rx, sizeof(UsbCommand));
// Check if the transfer was complete
if (rx_len == sizeof(UsbCommand))
UsbPacketReceived(rx, rx_len);
}
WDT_HIT(); WDT_HIT();

3
bootrom/bootrom.c
View file

@ -197,6 +197,7 @@ static void flash_mode(int externally_entered) {
//for (volatile size_t i=0; i<0x100000; i++) {}; //for (volatile size_t i=0; i<0x100000; i++) {};
for(;;) { for(;;) {
WDT_HIT();
if ( usb_poll_validate_length()) { if ( usb_poll_validate_length()) {
rx_len = usb_read(rx, sizeof(UsbCommand)); rx_len = usb_read(rx, sizeof(UsbCommand));
@ -204,8 +205,6 @@ static void flash_mode(int externally_entered) {
UsbPacketReceived(rx, rx_len); UsbPacketReceived(rx, rx_len);
} }
WDT_HIT();
if (!externally_entered && !BUTTON_PRESS()) { if (!externally_entered && !BUTTON_PRESS()) {
/* Perform a reset to leave flash mode */ /* Perform a reset to leave flash mode */
usb_disable(); usb_disable();

50
client/flash.c
View file

@ -13,7 +13,7 @@
void SendCommand(UsbCommand* txcmd); void SendCommand(UsbCommand* txcmd);
void ReceiveCommand(UsbCommand* rxcmd); void ReceiveCommand(UsbCommand* rxcmd);
void CloseProxmark(); void CloseProxmark();
int OpenProxmark(size_t i); int OpenProxmark();
// FIXME: what the fuckity fuck // FIXME: what the fuckity fuck
unsigned int current_command = CMD_UNKNOWN; unsigned int current_command = CMD_UNKNOWN;
@ -41,8 +41,7 @@ static const uint8_t elf_ident[] = {
// Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent // Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
// unaligned segments if needed // unaligned segments if needed
static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs) static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs) {
{
Elf32_Phdr *phdr = phdrs; Elf32_Phdr *phdr = phdrs;
flash_seg_t *seg; flash_seg_t *seg;
uint32_t last_end = 0; uint32_t last_end = 0;
@ -187,8 +186,7 @@ static int check_segs(flash_file_t *ctx, int can_write_bl) {
} }
// Load an ELF file and prepare it for flashing // Load an ELF file and prepare it for flashing
int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) int flash_load(flash_file_t *ctx, const char *name, int can_write_bl) {
{
FILE *fd = NULL; FILE *fd = NULL;
Elf32_Ehdr ehdr; Elf32_Ehdr ehdr;
Elf32_Phdr *phdrs = NULL; Elf32_Phdr *phdrs = NULL;
@ -269,10 +267,8 @@ fail:
} }
// Get the state of the proxmark, backwards compatible // Get the state of the proxmark, backwards compatible
static int get_proxmark_state(uint32_t *state) static int get_proxmark_state(uint32_t *state) {
{ UsbCommand c = {CMD_DEVICE_INFO};
UsbCommand c;
c.cmd = CMD_DEVICE_INFO;
SendCommand(&c); SendCommand(&c);
UsbCommand resp; UsbCommand resp;
ReceiveCommand(&resp); ReceiveCommand(&resp);
@ -297,13 +293,11 @@ static int get_proxmark_state(uint32_t *state)
return -1; return -1;
break; break;
} }
return 0; return 0;
} }
// Enter the bootloader to be able to start flashing // Enter the bootloader to be able to start flashing
static int enter_bootloader(char *serial_port_name) static int enter_bootloader(char *serial_port_name) {
{
uint32_t state; uint32_t state;
if (get_proxmark_state(&state) < 0) if (get_proxmark_state(&state) < 0)
@ -314,7 +308,7 @@ static int enter_bootloader(char *serial_port_name)
return 0; return 0;
if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) { if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
fprintf(stderr,"Entering bootloader...\n"); fprintf(stderr, "Entering bootloader...\n");
UsbCommand c; UsbCommand c;
memset(&c, 0, sizeof (c)); memset(&c, 0, sizeof (c));
@ -324,22 +318,22 @@ static int enter_bootloader(char *serial_port_name)
// and enter the bootrom on the next boot. // and enter the bootrom on the next boot.
c.cmd = CMD_START_FLASH; c.cmd = CMD_START_FLASH;
SendCommand(&c); SendCommand(&c);
fprintf(stderr,"(Press and release the button only to abort)\n"); fprintf(stderr, "(Press and release the button only to abort)\n");
} else { } else {
// Old style handover: Ask the user to press the button, then reset the board // Old style handover: Ask the user to press the button, then reset the board
c.cmd = CMD_HARDWARE_RESET; c.cmd = CMD_HARDWARE_RESET;
SendCommand(&c); SendCommand(&c);
fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n"); fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
} }
msleep(100); msleep(100);
CloseProxmark(); CloseProxmark();
fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name); fprintf(stderr, "Waiting for Proxmark to reappear on %s", serial_port_name);
do { do {
msleep(1000); msleep(1000);
fprintf(stderr, "."); fprintf(stderr, ".");
} while (!OpenProxmark(0)); } while ( !OpenProxmark());
fprintf(stderr," Found.\n"); fprintf(stderr, " Found.\n");
return 0; return 0;
} }
@ -347,19 +341,17 @@ static int enter_bootloader(char *serial_port_name)
return -1; return -1;
} }
static int wait_for_ack(UsbCommand *ack) static int wait_for_ack(UsbCommand *ack) {
{
ReceiveCommand(ack); ReceiveCommand(ack);
if (ack->cmd != CMD_ACK) { if (ack->cmd != CMD_ACK) {
printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n", ack->cmd, (ack->cmd==CMD_NACK)?"NACK":""); printf("Error: Unexpected reply 0x%04" PRIx64 " %s (expected ACK)\n", ack->cmd, (ack->cmd == CMD_NACK) ? "NACK" : "");
return -1; return -1;
} }
return 0; return 0;
} }
// Go into flashing mode // Go into flashing mode
int flash_start_flashing(int enable_bl_writes,char *serial_port_name) int flash_start_flashing(int enable_bl_writes, char *serial_port_name) {
{
uint32_t state; uint32_t state;
if (enter_bootloader(serial_port_name) < 0) if (enter_bootloader(serial_port_name) < 0)
@ -392,8 +384,7 @@ int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
return 0; return 0;
} }
static int write_block(uint32_t address, uint8_t *data, uint32_t length) static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
{
uint8_t block_buf[BLOCK_SIZE]; uint8_t block_buf[BLOCK_SIZE];
memset(block_buf, 0xFF, BLOCK_SIZE); memset(block_buf, 0xFF, BLOCK_SIZE);
memcpy(block_buf, data, length); memcpy(block_buf, data, length);
@ -415,8 +406,7 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length)
} }
// Write a file's segments to Flash // Write a file's segments to Flash
int flash_write(flash_file_t *ctx) int flash_write(flash_file_t *ctx) {
{
fprintf(stderr, "Writing segments for file: %s\n", ctx->filename); fprintf(stderr, "Writing segments for file: %s\n", ctx->filename);
for (int i = 0; i < ctx->num_segs; i++) { for (int i = 0; i < ctx->num_segs; i++) {
flash_seg_t *seg = &ctx->segments[i]; flash_seg_t *seg = &ctx->segments[i];
@ -425,8 +415,7 @@ int flash_write(flash_file_t *ctx)
uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE; uint32_t blocks = (length + BLOCK_SIZE - 1) / BLOCK_SIZE;
uint32_t end = seg->start + length; uint32_t end = seg->start + length;
fprintf(stderr, " 0x%08x..0x%08x [0x%x / %d blocks]", fprintf(stderr, " 0x%08x..0x%08x [0x%x / %d blocks]", seg->start, end - 1, length, blocks);
seg->start, end - 1, length, blocks);
int block = 0; int block = 0;
uint8_t *data = seg->data; uint8_t *data = seg->data;
@ -455,8 +444,7 @@ int flash_write(flash_file_t *ctx)
} }
// free a file context // free a file context
void flash_free(flash_file_t *ctx) void flash_free(flash_file_t *ctx) {
{
if (!ctx) if (!ctx)
return; return;
if (ctx->segments) { if (ctx->segments) {

35
client/flasher.c
View file

@ -16,6 +16,8 @@
#include "uart.h" #include "uart.h"
#include "usb_cmd.h" #include "usb_cmd.h"
#define MAX_FILES 4
#ifdef _WIN32 #ifdef _WIN32
# define unlink(x) # define unlink(x)
#else #else
@ -25,17 +27,17 @@
static serial_port sp; static serial_port sp;
static char* serial_port_name; static char* serial_port_name;
void cmd_debug(UsbCommand* UC) { void cmd_debug(UsbCommand* c) {
// Debug // Debug
printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand)); printf("UsbCommand length[len=%zd]\n", sizeof(UsbCommand));
printf(" cmd[len=%zd]: %016" PRIx64"\n", sizeof(UC->cmd), UC->cmd); printf(" cmd[len=%zd]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
printf(" arg0[len=%zd]: %016" PRIx64"\n", sizeof(UC->arg[0]), UC->arg[0]); printf(" arg0[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
printf(" arg1[len=%zd]: %016" PRIx64"\n", sizeof(UC->arg[1]), UC->arg[1]); printf(" arg1[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
printf(" arg2[len=%zd]: %016" PRIx64"\n", sizeof(UC->arg[2]), UC->arg[2]); printf(" arg2[len=%zd]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
printf(" data[len=%zd]: ", sizeof(UC->d.asBytes)); printf(" data[len=%zd]: ", sizeof(c->d.asBytes));
for (size_t i=0; i<16; i++) for (size_t i=0; i<16; i++)
printf("%02x", UC->d.asBytes[i]); printf("%02x", c->d.asBytes[i]);
printf("...\n"); printf("...\n");
} }
@ -43,7 +45,7 @@ void cmd_debug(UsbCommand* UC) {
void SendCommand(UsbCommand* txcmd) { void SendCommand(UsbCommand* txcmd) {
// printf("send: "); // printf("send: ");
// cmd_debug(txcmd); // cmd_debug(txcmd);
if (!uart_send(sp,(byte_t*)txcmd, sizeof(UsbCommand))) { if (!uart_send(sp, (byte_t*)txcmd, sizeof(UsbCommand))) {
printf("Sending bytes to proxmark failed\n"); printf("Sending bytes to proxmark failed\n");
exit(1); exit(1);
} }
@ -70,13 +72,17 @@ void CloseProxmark() {
unlink(serial_port_name); unlink(serial_port_name);
} }
int OpenProxmark(size_t i) { int OpenProxmark() {
sp = uart_open(serial_port_name); sp = uart_open(serial_port_name);
//poll once a second //poll once a second
if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) if (sp == INVALID_SERIAL_PORT) {
printf("ERROR: invalid serial port\n");
return 0; return 0;
} else if (sp == CLAIMED_SERIAL_PORT) {
printf("ERROR: serial port is claimed by another process\n");
return 0;
}
return 1; return 1;
} }
@ -95,10 +101,7 @@ static void usage(char *argv0) {
fprintf(stderr, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n"); fprintf(stderr, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
} }
#define MAX_FILES 4 int main(int argc, char **argv) {
int main(int argc, char **argv)
{
int can_write_bl = 0; int can_write_bl = 0;
int num_files = 0; int num_files = 0;
int res; int res;
@ -138,7 +141,7 @@ int main(int argc, char **argv)
fprintf(stderr, "."); fprintf(stderr, ".");
} while (!OpenProxmark(0)); } while (!OpenProxmark(0));
fprintf(stderr," Found.\n"); fprintf(stderr, " Found.\n");
res = flash_start_flashing(can_write_bl, serial_port_name); res = flash_start_flashing(can_write_bl, serial_port_name);
if (res < 0) if (res < 0)

3
client/proxmark3.c
View file

@ -125,7 +125,6 @@ static void *uart_receiver(void *targ) {
PrintAndLog("Sending bytes to proxmark failed"); PrintAndLog("Sending bytes to proxmark failed");
} }
__atomic_clear(&txcmd_pending, __ATOMIC_SEQ_CST); __atomic_clear(&txcmd_pending, __ATOMIC_SEQ_CST);
//txcmd_pending = false;
// set offline flag // set offline flag
if ( counter_to_offline == 3 ) { if ( counter_to_offline == 3 ) {
@ -356,7 +355,7 @@ int main(int argc, char* argv[]) {
#ifdef HAVE_GUI #ifdef HAVE_GUI
# if _WIN32 # ifdef _WIN32
InitGraphics(argc, argv, script_cmds_file, usb_present); InitGraphics(argc, argv, script_cmds_file, usb_present);
MainGraphics(); MainGraphics();
# else # else

9
common/cmd.c
View file

@ -41,11 +41,14 @@ bool cmd_receive(UsbCommand* cmd) {
// Try to retrieve the available command frame // Try to retrieve the available command frame
size_t rxlen = usb_read((byte_t*)cmd, sizeof(UsbCommand)); size_t rxlen = usb_read((byte_t*)cmd, sizeof(UsbCommand));
// Check if the transfer was complete // (iceman) this check is wrong. Since USB can send packages which is not sizeof(usbcommand) 544 bytes.
if (rxlen != sizeof(UsbCommand)) return false; // hence, I comment it out
// Check if the transfer was complete
//if (rxlen != sizeof(UsbCommand)) return false;
// Received command successfully // Received command successfully
return true; //return true;
return (rxlen);
} }
bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len) { bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len) {

366
common/usb_cdc.c
View file

@ -44,25 +44,29 @@ AT91SAM7S256 USB Device Port
– Ping-pong Mode (two memory banks) for bulk endpoints – Ping-pong Mode (two memory banks) for bulk endpoints
*/ */
//
#define AT91C_EP_CONTROL 0 #define AT91C_EP_CONTROL 0
#define AT91C_EP_CONTROL_SIZE 0x08 #define AT91C_EP_OUT 1 // cfg bulk out
#define AT91C_EP_IN 2 // cfg bulk in
#define AT91C_EP_NOTIFY 3 // cfg cdc notification interrup
#define AT91C_EP_IN 2 #define AT91C_EP_CONTROL_SIZE 8
#define AT91C_EP_IN_SIZE 0x40 #define AT91C_EP_OUT_SIZE 64
#define AT91C_EP_IN_SIZE 64
#define AT91C_EP_OUT 1
#define AT91C_EP_OUT_SIZE 0x40
// Section: USB Descriptors // Section: USB Descriptors
#define USB_DESCRIPTOR_DEVICE 0x01 // bDescriptorType for a Device Descriptor. #define USB_DESCRIPTOR_DEVICE 0x01 // DescriptorType for a Device Descriptor.
#define USB_DESCRIPTOR_CONFIGURATION 0x02 // bDescriptorType for a Configuration Descriptor. #define USB_DESCRIPTOR_CONFIGURATION 0x02 // DescriptorType for a Configuration Descriptor.
#define USB_DESCRIPTOR_STRING 0x03 // bDescriptorType for a String Descriptor. #define USB_DESCRIPTOR_STRING 0x03 // DescriptorType for a String Descriptor.
#define USB_DESCRIPTOR_INTERFACE 0x04 // bDescriptorType for an Interface Descriptor. #define USB_DESCRIPTOR_INTERFACE 0x04 // DescriptorType for an Interface Descriptor.
#define USB_DESCRIPTOR_ENDPOINT 0x05 // bDescriptorType for an Endpoint Descriptor. #define USB_DESCRIPTOR_ENDPOINT 0x05 // DescriptorType for an Endpoint Descriptor.
#define USB_DESCRIPTOR_DEVICE_QUALIFIER 0x06 // bDescriptorType for a Device Qualifier. #define USB_DESCRIPTOR_DEVICE_QUALIFIER 0x06 // DescriptorType for a Device Qualifier.
#define USB_DESCRIPTOR_OTHER_SPEED 0x07 // bDescriptorType for a Other Speed Configuration. #define USB_DESCRIPTOR_OTHER_SPEED 0x07 // DescriptorType for a Other Speed Configuration.
#define USB_DESCRIPTOR_INTERFACE_POWER 0x08 // bDescriptorType for Interface Power. #define USB_DESCRIPTOR_INTERFACE_POWER 0x08 // DescriptorType for Interface Power.
#define USB_DESCRIPTOR_OTG 0x09 // bDescriptorType for an OTG Descriptor. #define USB_DESCRIPTOR_OTG 0x09 // DescriptorType for an OTG Descriptor.
#define USB_DESCRIPTOR_IAD 0x0B // DescriptorType for a Interface Association Descriptor
#define USB_DESCRIPTOR_TYPE_BO 0x0F // DescriptorType for a BOS Descriptor.
/* Configuration Attributes */ /* Configuration Attributes */
#define _DEFAULT (0x01<<7) //Default Value (Bit 7 is set) #define _DEFAULT (0x01<<7) //Default Value (Bit 7 is set)
@ -99,104 +103,148 @@ AT91SAM7S256 USB Device Port
static const char devDescriptor[] = { static const char devDescriptor[] = {
/* Device descriptor */ /* Device descriptor */
0x12, // Length 0x12, // Length
0x01, // Descriptor Type (DEVICE) USB_DESCRIPTOR_DEVICE, // Descriptor Type (DEVICE)
0x10,0x02, // Complies with USB Spec. Release (0200h = release 2.00) 0210 == release 2.10 0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.00) 0210 == release 2.10
0x02, // Device Class: CDC class code 2, // Device Class: Communication Device Class
0x02, // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport :) ] 2, // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport ]
0x00, // Device Protocol: CDC Device protocol 0, // Device Protocol: CDC Device protocol (unused)
AT91C_EP_CONTROL_SIZE, // MaxPacketSize0 AT91C_EP_CONTROL_SIZE, // MaxPacketSize0
0xc4,0x9a, // Vendor ID [0x9ac4 = J. Westhues] 0xc4,0x9a, // Vendor ID [0x9ac4 = J. Westhues]
0x8f,0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument] 0x8f,0x4b, // Product ID [0x4b8f = Proxmark-3 RFID Instrument]
0x01,0x00, // Device release number (0001) 0x00,0x01, // BCD Device release number (1.00)
0x01, // index Manufacturer 1, // index Manufacturer
0x02, // index Product 2, // index Product
0x03, // index SerialNumber 3, // index SerialNumber
0x01 // Number of Configs 1 // Number of Configs
}; };
static const char cfgDescriptor[] = { static const char cfgDescriptor[] = {
/* ============== CONFIGURATION 1 =========== */
/* Configuration 1 descriptor */ /* Configuration 1 descriptor */
0x09, // Length // -----------------------------
9, // Length
USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type USB_DESCRIPTOR_CONFIGURATION, // Descriptor Type
0x43,0x00, // Total Length 2 EP + Control (9+9+5+5+4+5+7+9+7+7), 0, // Total Length 2 EP + Control
0x02, // Number of Interfaces 2, // Number of Interfaces
0x01, // Index value of this Configuration 1, // Index value of this Configuration (used in SetConfiguration from Host)
0x00, // Configuration string index 0, // Configuration string index
0xC0, // Attributes 0xA0 _DEFAULT, // Attributes 0xA0
0xFA, // Max Power consumption 0xFA, // Max Power consumption
/* Communication Class Interface Descriptor Requirement */ // IAD to associate the one CDC interface
0x09, // Length // --------------------------------------
/*
8, // Length
USB_DESCRIPTOR_IAD, // IAD_DESCRIPTOR (0x0B)
0, // CDC_INT_INTERFACE NUMBER (
2, // IAD INTERFACE COUNT (two interfaces)
2, // Function Class: CDC_CLASS
2, // Function SubClass: ACM
1, // Function Protocol: v.25term
0, // iInterface
*/
/* Interface 0 Descriptor */
/* CDC Communication Class Interface Descriptor Requirement for Notification*/
// -----------------------------------------------------------
9, // Length
USB_DESCRIPTOR_INTERFACE, // Descriptor Type USB_DESCRIPTOR_INTERFACE, // Descriptor Type
0x00, // Interface Number 0, // Interface Number
0x00, // Alternate Setting 0, // Alternate Setting
0x01, // Number of Endpoints in this interface 1, // Number of Endpoints in this interface
0x02, // Interface Class code (CDC) 2, // Interface Class code (Communication Interface Class)
0x02, // Interface Subclass code (ACM) 2, // Interface Subclass code (Abstract Control Model)
0x01, // InterfaceProtocol (rfidler 0x00, pm3 0x01 == VT25) 1, // InterfaceProtocol (Common AT Commands, V.25term)
0x00, // iInterface 0, // iInterface
/* Header Functional Descriptor */ /* Header Functional Descriptor */
0x05, // Function Length 5, // Function Length
0x24, // Descriptor type: CS_INTERFACE 0x24, // Descriptor type: CS_INTERFACE
0x00, // Descriptor subtype: Header Func Desc 0, // Descriptor subtype: Header Functional Descriptor
0x10,0x01, // bcd CDC:1.1 0x10,0x01, // bcd CDC:1.1
/* ACM Functional Descriptor */ /* ACM Functional Descriptor */
0x04, // Function Length 4, // Function Length
0x24, // Descriptor Type: CS_INTERFACE 0x24, // Descriptor Type: CS_INTERFACE
0x02, // Descriptor Subtype: ACM Func Desc 2, // Descriptor Subtype: Abstract Control Management Functional Descriptor
0x02, // Capabilities (rfidler 0x04, pm3 0x02, zero should also work ) 2, // Capabilities D1, Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State
/* Union Functional Descriptor */ /* Union Functional Descriptor */
0x05, // Function Length 5, // Function Length
0x24, // Descriptor Type: CS_INTERFACE 0x24, // Descriptor Type: CS_INTERFACE
0x06, // Descriptor Subtype: Union Func Desc 6, // Descriptor Subtype: Union Functional Descriptor
0x00, // MasterInterface: Communication Class Interface 0, // MasterInterface: Communication Class Interface
0x01, // SlaveInterface0: Data Class Interface 1, // SlaveInterface0: Data Class Interface
/* Call Management Functional Descriptor */ /* Call Management Functional Descriptor */
0x05, // Function Length 5, // Function Length
0x24, // Descriptor Type: CS_INTERFACE 0x24, // Descriptor Type: CS_INTERFACE
0x01, // Descriptor Subtype: Call Management Func Desc 1, // Descriptor Subtype: Call Management Functional Descriptor
0x00, // Capabilities: D1 + D0 0, // Capabilities: Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself
0x01, // Data Interface: Data Class Interface 1 1, // Data Interface: Data Class Interface
/* Endpoint descriptor */ /* Protocol Functional Descriptor */
0x07, // Length /*
6,
0x24, // Descriptor Type: CS_INTERFACE
0x0B, // Descriptor Subtype: Protocol Unit functional Descriptor
0xDD, // constant uniq ID of unit
0xFE, // protocol
*/
/* CDC Notification Endpoint descriptor */
// ---------------------------------------
7, // Length
USB_DESCRIPTOR_ENDPOINT, // Descriptor Type USB_DESCRIPTOR_ENDPOINT, // Descriptor Type
_EP03_IN, // EndpointAddress, Endpoint 03-IN _EP03_IN, // EndpointAddress: Endpoint 03 - IN
_INTERRUPT, // Attributes _INTERRUPT, // Attributes
0x08, 0x00, // MaxPacket Size (pm3 0x08) AT91C_EP_CONTROL_SIZE, 0x00, // MaxPacket Size: EP0 - 8
0x02, // Interval polling (rfidler 0x02, pm3 0xff) 0xFF, // Interval polling
/* Data Class Interface Descriptor Requirement */
0x09, // Length /* Interface 1 Descriptor */
/* CDC Data Class Interface 1 Descriptor Requirement */
9, // Length
USB_DESCRIPTOR_INTERFACE, // Descriptor Type USB_DESCRIPTOR_INTERFACE, // Descriptor Type
0x01, // Interface Number 1, // Interface Number
0x00, // Alternate Setting 0, // Alternate Setting
0x02, // Number of Endpoints 2, // Number of Endpoints
0x0A, // Interface Class ( Data interface class ) 0x0A, // Interface Class: CDC Data interface class
0x00, // Interface Subclass 0, // Interface Subclass: not used
0x00, // Interface Protocol 0, // Interface Protocol: No class specific protocol required (usb spec)
0x00, // Interface - no string descriptor 0, // Interface
/* Endpoint descriptor */ /* Endpoint descriptor */
0x07, // Length 7, // Length
USB_DESCRIPTOR_ENDPOINT, // Descriptor Type USB_DESCRIPTOR_ENDPOINT, // Descriptor Type
_EP01_OUT, // Endpoint Address, Endpoint 01-OUT _EP01_OUT, // Endpoint Address: Endpoint 01 - OUT
_BULK, // Attributes BULK _BULK, // Attributes: BULK
0x40, 0x00, // MaxPacket Size AT91C_EP_OUT_SIZE, 0x00, // MaxPacket Size: 64 bytes
0x00, // Interval (ignored for bulk) 0, // Interval: ignored for bulk
/* Endpoint descriptor */ /* Endpoint descriptor */
0x07, // Length 7, // Length
USB_DESCRIPTOR_ENDPOINT, // DescriptorType USB_DESCRIPTOR_ENDPOINT, // Descriptor Type
_EP02_IN, // Endpoint Address, Endpoint 02-IN _EP02_IN, // Endpoint Address: Endpoint 02 - IN
_BULK, // Attributes BULK _BULK, // Attribute: BULK
0x40, 0x00, // MaxPacket Size AT91C_EP_IN_SIZE, 0x00, // MaxPacket Size: 64 bytes
0x00 // Interval (ignored for bulk) 0 // Interval: ignored for bulk
};
// BOS descriptor
static const char bosDescriptor[] = {
0x5,
USB_DESCRIPTOR_TYPE_BO,
0xC,
0x0,
0x1, // 1 device capability
0x7,
0x10, //USB_DEVICE_CAPABITY_TYPE,
0x2,
0x2, // LPM capability bit set
0x0,
0x0,
0x0
}; };
// Microsoft OS Extended Configuration Compatible ID Descriptor // Microsoft OS Extended Configuration Compatible ID Descriptor
@ -208,7 +256,7 @@ static const char CompatIDFeatureDescriptor[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Reserved (7bytes) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Reserved (7bytes)
//-----function section 1------ //-----function section 1------
0x00, // Interface Number #0 0x00, // Interface Number #0
0x01, // reserved 0x01, // reserved (0x1)
0x57, 0x49, 0x4E, 0x55, 0x53, 0x42, 0x00, 0x00, // Compatible ID ('WINUSB\0\0') (8bytes) 0x57, 0x49, 0x4E, 0x55, 0x53, 0x42, 0x00, 0x00, // Compatible ID ('WINUSB\0\0') (8bytes)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Sub-Compatible ID (8byte) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Sub-Compatible ID (8byte)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Reserved (6bytes) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Reserved (6bytes)
@ -237,9 +285,9 @@ static const char OSprop[] = {
// u32 datalen (39*2 = 78) // u32 datalen (39*2 = 78)
78, 0, 0, 0, 78, 0, 0, 0,
// data {4D36E978-E325-11CE-BFC1-08002BE10318} // data {4D36E978-E325-11CE-BFC1-08002BE10318}
'{',0,'4',0,'D',0,'3',0,'6',0,'E',0,'9',0,'7',0,'8',0,'-',0,'E',0,'3',0,'2',0,'5',0, '{',0,'4',0,'d',0,'3',0,'6',0,'e',0,'9',0,'7',0,'8',0,'-',0,'e',0,'3',0,'2',0,'5',0,
'-',0,'1',0,'1',0,'C',0,'E',0,'-',0,'B',0,'F',0,'C',0,'1',0,'-',0,'0',0,'8',0,'0',0, '-',0,'1',0,'1',0,'c',0,'e',0,'-',0,'b',0,'f',0,'c',0,'1',0,'-',0,'0',0,'8',0,'0',0,
'0',0,'2',0,'B',0,'E',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0, '0',0,'2',0,'b',0,'e',0,'1',0,'0',0,'3',0,'1',0,'8',0,'}',0,0,0,
//-----property section 2------ //-----property section 2------
// u32 size ( 14+12+38 == 64) // u32 size ( 14+12+38 == 64)
@ -297,6 +345,12 @@ static const char StrSerialNumber[] = {
'8',0,'8',0,'8',0,'8',0,'8',0,'8',0,'8',0,'8',0 '8',0,'8',0,'8',0,'8',0,'8',0,'8',0,'8',0,'8',0
}; };
static const char StrConfig1[] = {
22, //length
3, //string
'P',0,'M',0,'3',0,' ',0,'C',0,'o',0,'n',0,'f',0,'i',0,'g',0
};
// size inkluderar sitt egna fält. // size inkluderar sitt egna fält.
static const char StrMS_OSDescriptor[] = { static const char StrMS_OSDescriptor[] = {
18, // length 0x12 18, // length 0x12
@ -310,6 +364,7 @@ const char* getStringDescriptor(uint8_t idx) {
case 1: return StrManufacturer; case 1: return StrManufacturer;
case 2: return StrProduct; case 2: return StrProduct;
case 3: return StrSerialNumber; case 3: return StrSerialNumber;
case 4: return StrConfig1;
case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor; case MS_OS_DESCRIPTOR_INDEX: return StrMS_OSDescriptor;
default: default:
return(NULL); return(NULL);
@ -370,10 +425,10 @@ const char* getStringDescriptor(uint8_t idx) {
#define SET_CONTROL_LINE_STATE 0x2221 #define SET_CONTROL_LINE_STATE 0x2221
typedef struct { typedef struct {
unsigned int dwDTERRate; uint32_t BitRate;
char bCharFormat; uint8_t Format;
char bParityType; uint8_t ParityType;
char bDataBits; uint8_t DataBits;
} AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING; } AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING;
AT91S_CDC_LINE_CODING line = { AT91S_CDC_LINE_CODING line = {
@ -383,9 +438,9 @@ AT91S_CDC_LINE_CODING line = {
8}; // 8 Data bits 8}; // 8 Data bits
AT91PS_UDP pUdp = AT91C_BASE_UDP; AT91PS_UDP pUdp = AT91C_BASE_UDP;
uint16_t btConfiguration = 0; uint8_t btConfiguration = 0;
uint16_t btConnection = 0; uint8_t btConnection = 0;
byte_t btReceiveBank = AT91C_UDP_RX_DATA_BK0; uint8_t btReceiveBank = AT91C_UDP_RX_DATA_BK0;
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
//* \fn usb_disable //* \fn usb_disable
@ -458,12 +513,6 @@ bool usb_check() {
// reconnected ONCE and // reconnected ONCE and
if ( !USB_ATTACHED() ){ if ( !USB_ATTACHED() ){
usb_reconnect = 1; usb_reconnect = 1;
LED_C_INV();
LED_C_INV();
LED_C_INV();
LED_C_INV();
LED_C_INV();
LED_C_INV();
return false; return false;
} }
@ -471,18 +520,6 @@ bool usb_check() {
if ( USB_ATTACHED() && usb_reconnect == 1 ) { if ( USB_ATTACHED() && usb_reconnect == 1 ) {
if ( usb_configured == 0) { if ( usb_configured == 0) {
// blink
LED_D_INV();
LED_D_INV();
LED_D_INV();
LED_D_INV();
LED_D_INV();
LED_D_INV();
LED_D_INV();
LED_D_INV();
LED_D_INV();
LED_D_INV();
usb_disable(); usb_disable();
usb_enable(); usb_enable();
@ -494,8 +531,6 @@ bool usb_check() {
} }
*/ */
WDT_HIT();
// interrupt status register // interrupt status register
AT91_REG isr = pUdp->UDP_ISR; AT91_REG isr = pUdp->UDP_ISR;
@ -508,16 +543,20 @@ bool usb_check() {
// Enable the function // Enable the function
pUdp->UDP_FADDR = AT91C_UDP_FEN; pUdp->UDP_FADDR = AT91C_UDP_FEN;
// Configure endpoint 0 (enable control endpoint) // Configure endpoint 0 (enable control endpoint)
UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL)); pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);
// clear it // clear it
pUdp->UDP_ICR |= AT91C_UDP_ENDBUSRES; pUdp->UDP_ICR |= AT91C_UDP_ENDBUSRES;
} }
else if (isr & AT91C_UDP_EPINT0) { else if (isr & AT91C_UDP_EPINT0) {
pUdp->UDP_ICR = AT91C_UDP_EPINT0; pUdp->UDP_ICR = AT91C_UDP_EPINT0;
AT91F_CDC_Enumerate(); AT91F_CDC_Enumerate();
// clear it?
pUdp->UDP_ICR |= AT91C_UDP_EPINT0; pUdp->UDP_ICR |= AT91C_UDP_EPINT0;
} }
else if (isr & AT91C_UDP_EPINT3 ) {
pUdp->UDP_ICR = AT91C_UDP_EPINT3;
AT91F_CDC_Enumerate();
pUdp->UDP_ICR |= AT91C_UDP_EPINT3;
}
return (btConfiguration) ? true : false; return (btConfiguration) ? true : false;
} }
@ -542,10 +581,11 @@ bool usb_poll_validate_length() {
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
//* \fn usb_read //* \fn usb_read
//* \brief Read available data from Endpoint OUT //* \brief Read available data from Endpoint 1 OUT (host to device)
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
uint32_t usb_read(byte_t* data, size_t len) { uint32_t usb_read(byte_t* data, size_t len) {
byte_t bank = btReceiveBank;
uint8_t bank = btReceiveBank;
uint32_t packetSize, nbBytesRcv = 0; uint32_t packetSize, nbBytesRcv = 0;
uint32_t time_out = 0; uint32_t time_out = 0;
@ -574,7 +614,7 @@ uint32_t usb_read(byte_t* data, size_t len) {
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
//* \fn usb_write //* \fn usb_write
//* \brief Send through endpoint 2 //* \brief Send through endpoint 2 (device to host)
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
uint32_t usb_write(const byte_t* data, const size_t len) { uint32_t usb_write(const byte_t* data, const size_t len) {
@ -584,25 +624,29 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
size_t length = len; size_t length = len;
uint32_t cpt = 0; uint32_t cpt = 0;
// Send the first packet // send first chunk
cpt = MIN(length, AT91C_EP_IN_SIZE-1); cpt = MIN(length, AT91C_EP_IN_SIZE);
length -= cpt; length -= cpt;
while (cpt--) pUdp->UDP_FDR[AT91C_EP_IN] = *data++; while (cpt--) {
pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
}
UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY) UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY)
while (length) { while (length) {
// Fill the second bank // Send next chunk
cpt = MIN(length, AT91C_EP_IN_SIZE-1); cpt = MIN(length, AT91C_EP_IN_SIZE);
length -= cpt; length -= cpt;
while (cpt--) pUdp->UDP_FDR[AT91C_EP_IN] = *data++; while (cpt--) {
pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
}
// Wait for the first bank to be sent // Wait for the first bank to be sent
while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) { while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
if (!usb_check()) return length; if (!usb_check()) return length;
} }
UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP) UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP)
UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY) UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY)
} }
@ -622,13 +666,14 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) { void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
uint32_t cpt = 0; uint32_t cpt = 0;
AT91_REG csr;
do { do {
cpt = MIN(length, AT91C_EP_CONTROL_SIZE); cpt = MIN(length, AT91C_EP_CONTROL_SIZE);
length -= cpt; length -= cpt;
while (cpt--) while (cpt--)
pUdp->UDP_FDR[0] = *pData++; pUdp->UDP_FDR[AT91C_EP_CONTROL] = *pData++;
if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) { if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {
@ -638,13 +683,14 @@ void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {
UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY) UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY)
do { do {
csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];
// Data IN stage has been stopped by a status OUT // Data IN stage has been stopped by a status OUT
if ( pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0) { if ( csr & AT91C_UDP_RX_DATA_BK0) {
UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0) UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0)
return; return;
} }
} while ( !( pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) ); } while ( !(csr & AT91C_UDP_TXCOMP) );
} while (length); } while (length);
@ -676,6 +722,9 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
//* \fn AT91F_CDC_Enumerate //* \fn AT91F_CDC_Enumerate
//* \brief This function is a callback invoked when a SETUP packet is received //* \brief This function is a callback invoked when a SETUP packet is received
//* problem:
//* 1. this is for USB endpoint0. the control endpoint.
//* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
//*---------------------------------------------------------------------------- //*----------------------------------------------------------------------------
void AT91F_CDC_Enumerate() { void AT91F_CDC_Enumerate() {
byte_t bmRequestType, bRequest; byte_t bmRequestType, bRequest;
@ -684,16 +733,16 @@ void AT91F_CDC_Enumerate() {
if ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP) ) if ( !(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP) )
return; return;
bmRequestType = pUdp->UDP_FDR[0]; bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];
bRequest = pUdp->UDP_FDR[0]; bRequest = pUdp->UDP_FDR[AT91C_EP_CONTROL];
wValue = (pUdp->UDP_FDR[0] & 0xFF); wValue = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
wValue |= (pUdp->UDP_FDR[0] << 8); wValue |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
wIndex = (pUdp->UDP_FDR[0] & 0xFF); wIndex = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
wIndex |= (pUdp->UDP_FDR[0] << 8); wIndex |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
wLength = (pUdp->UDP_FDR[0] & 0xFF); wLength = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);
wLength |= (pUdp->UDP_FDR[0] << 8); wLength |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);
if (bmRequestType & 0x80) { if (bmRequestType & 0x80) { // Data Phase Transfer Direction Device to Host
UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR) UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR)
} }
UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP) UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP)
@ -701,15 +750,15 @@ void AT91F_CDC_Enumerate() {
if ( bRequest == MS_VENDOR_CODE) { if ( bRequest == MS_VENDOR_CODE) {
if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0 if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0
if ( wIndex == MS_EXTENDED_COMPAT_ID ) { // 4 if ( wIndex == MS_EXTENDED_COMPAT_ID ) { // 4
AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength)); //AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength));
return; //return;
} }
} }
if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) { //C1 if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) { //C1
//if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5 - winusb bug with wIndex == interface index, so I just send it always) // if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5 - winusb bug with wIndex == interface index, so I just send it always)
AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength)); //AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength));
return; //return;
//} // }
} }
} }
// Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1 // Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
@ -719,6 +768,8 @@ void AT91F_CDC_Enumerate() {
AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength)); AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));
else if (wValue == 0x200) // Return Configuration Descriptor else if (wValue == 0x200) // Return Configuration Descriptor
AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength)); AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));
else if ((wValue & 0xF00) == 0xF00) // Return BOS Descriptor
AT91F_USB_SendData(pUdp, bosDescriptor, MIN(sizeof(bosDescriptor), wLength));
else if ((wValue & 0x300) == 0x300) { // Return String Descriptor else if ((wValue & 0x300) == 0x300) { // Return String Descriptor
const char *strDescriptor = getStringDescriptor(wValue & 0xff); const char *strDescriptor = getStringDescriptor(wValue & 0xff);
@ -740,33 +791,32 @@ void AT91F_CDC_Enumerate() {
btConfiguration = wValue; btConfiguration = wValue;
AT91F_USB_SendZlp(pUdp); AT91F_USB_SendZlp(pUdp);
pUdp->UDP_GLBSTATE = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN; pUdp->UDP_GLBSTATE = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;
UDP_SET_EP_FLAGS(AT91C_EP_OUT, (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0 );
UDP_SET_EP_FLAGS(1, (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0 ); UDP_SET_EP_FLAGS(AT91C_EP_IN, (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN) : 0 );
UDP_SET_EP_FLAGS(2, (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN) : 0 ); UDP_SET_EP_FLAGS(AT91C_EP_NOTIFY, (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN) : 0 );
UDP_SET_EP_FLAGS(3, (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN) : 0 ); // pUdp->UDP_CSR[AT91C_EP_OUT] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;
// pUdp->UDP_CSR[1] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0; // pUdp->UDP_CSR[AT91C_EP_IN] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN) : 0;
// pUdp->UDP_CSR[2] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN) : 0; // pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN) : 0;
// pUdp->UDP_CSR[3] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN) : 0;
break; break;
case STD_GET_CONFIGURATION: case STD_GET_CONFIGURATION:
AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration)); AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));
break; break;
case STD_GET_STATUS_ZERO: case STD_GET_STATUS_ZERO:
wStatus = 0; wStatus = 0; // Device is Bus powered, remote wakeup disabled
AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus)); AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
break; break;
case STD_GET_STATUS_INTERFACE: case STD_GET_STATUS_INTERFACE:
wStatus = 0; wStatus = 0; // reserved for future use
AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus)); AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
break; break;
case STD_GET_STATUS_ENDPOINT: case STD_GET_STATUS_ENDPOINT:
wStatus = 0; wStatus = 0;
wIndex &= 0x0F; wIndex &= 0x0F;
if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= 3)) { if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {
wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1; wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus)); AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
} }
else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == 0)) { else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {
wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1; wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;
AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus)); AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));
} else { } else {
@ -781,7 +831,7 @@ void AT91F_CDC_Enumerate() {
break; break;
case STD_SET_FEATURE_ENDPOINT: case STD_SET_FEATURE_ENDPOINT:
wIndex &= 0x0F; wIndex &= 0x0F;
if ((wValue == 0) && wIndex && (wIndex <= 3)) { if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
pUdp->UDP_CSR[wIndex] = 0; pUdp->UDP_CSR[wIndex] = 0;
AT91F_USB_SendZlp(pUdp); AT91F_USB_SendZlp(pUdp);
} else { } else {
@ -796,18 +846,18 @@ void AT91F_CDC_Enumerate() {
break; break;
case STD_CLEAR_FEATURE_ENDPOINT: case STD_CLEAR_FEATURE_ENDPOINT:
wIndex &= 0x0F; wIndex &= 0x0F;
if ((wValue == 0) && wIndex && (wIndex <= 3)) { if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {
if (wIndex == 1) { if (wIndex == 1) {
//pUdp->UDP_CSR[1] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT); //pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);
UDP_SET_EP_FLAGS(1, (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) ); UDP_SET_EP_FLAGS(AT91C_EP_OUT, (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) );
} }
else if (wIndex == 2) { else if (wIndex == 2) {
//pUdp->UDP_CSR[2] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN); //pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);
UDP_SET_EP_FLAGS(2, (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN) ); UDP_SET_EP_FLAGS(AT91C_EP_IN, (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN) );
} }
else if (wIndex == 3) { else if (wIndex == 3) {
//pUdp->UDP_CSR[3] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_ISO_IN); //pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);
UDP_SET_EP_FLAGS(3, (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_ISO_IN) ); UDP_SET_EP_FLAGS(AT91C_EP_NOTIFY, (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN) );
} }
AT91F_USB_SendZlp(pUdp); AT91F_USB_SendZlp(pUdp);
} else { } else {

2
uart/uart_posix.c
View file

@ -224,7 +224,7 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
// Write time-out // Write time-out
if (res == 0) { if (res == 0) {
printf("UART:: write time-out (%d)\n", res); printf("UART:: write time-out\n");
return false; return false;
} }

9
uart/uart_win32.c
View file

@ -76,6 +76,7 @@ serial_port uart_open(const char* pcPortName) {
} }
// Prepare the device control // Prepare the device control
// doesn't matter since PM3 device ignors this CDC command: set_line_coding in usb_cdc.c
memset(&sp->dcb, 0, sizeof(DCB)); memset(&sp->dcb, 0, sizeof(DCB));
sp->dcb.DCBlength = sizeof(DCB); sp->dcb.DCBlength = sizeof(DCB);
if (!BuildCommDCBA("baud=115200 parity=N data=8 stop=1",&sp->dcb)) { if (!BuildCommDCBA("baud=115200 parity=N data=8 stop=1",&sp->dcb)) {
@ -124,14 +125,6 @@ bool uart_receive(const serial_port sp, byte_t* p_rx, size_t pszMaxRxLen, size_t
bool uart_send(const serial_port sp, const byte_t* p_tx, const size_t len) { bool uart_send(const serial_port sp, const byte_t* p_tx, const size_t len) {
DWORD txlen = 0; DWORD txlen = 0;
return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL); return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
/*
bool res = WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
if ( !res )
return false;
printf("TX %u\n", txlen);
return (txlen != 0);
*/
} }
bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) { bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {