]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
usb communication (device side) refactoring
authorpwpiwi <pwpiwi@users.noreply.github.com>
Sat, 11 Jan 2020 21:10:40 +0000 (22:10 +0100)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Wed, 15 Jan 2020 17:49:28 +0000 (18:49 +0100)
* merge cmd.c into usb_cdc.c
* move back usb_cdc.[ch] to common/
* declare low level functions usb_read() and usb_write() and more functions as static
* use cmd_receive() in bootrom.c and appmain.c
* remove unused memory wasting csrTab[100] in usb_cdc.c
* replace more byte_t by uint8_t
* more whitespace fixes

25 files changed:
armsrc/Makefile
armsrc/appmain.c
armsrc/cmd.c [deleted file]
armsrc/cmd.h [deleted file]
armsrc/epa.c
armsrc/hfsnoop.c
armsrc/hitag2.c
armsrc/hitagS.c
armsrc/i2c.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443b.c
armsrc/iso15693.c
armsrc/legicrf.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifaresim.c
armsrc/mifaresniff.c
armsrc/pcf7931.c
armsrc/usb_cdc.c [deleted file]
armsrc/usb_cdc.h [deleted file]
bootrom/Makefile
bootrom/bootrom.c
common/usb_cdc.c [new file with mode: 0644]
common/usb_cdc.h [new file with mode: 0644]

index 3d1ba79ea62fc758a50eb742ea51618eb2eda0d0..7b9e13566dc7e55e2d0d68bcefe330fcc390b1ba 100644 (file)
@@ -50,8 +50,7 @@ THUMBSRC = start.c \
        printf.c \
        util.c \
        string.c \
-       usb_cdc.c \
-       cmd.c
+       usb_cdc.c
 
 # Compile these in thumb mode optimized for speed (still smaller than ARM mode)
 THUMBOPTSRC = $(SRC_ISO15693)
index 70cabd2e20bfc00d8106a8c6443984db7135fb9a..38965c32ccf78305ac2886ea679cbda434a11e5b 100644 (file)
@@ -13,7 +13,6 @@
 #include <stdarg.h>
 
 #include "usb_cdc.h"
-#include "cmd.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "fpga.h"
@@ -936,9 +935,7 @@ void ListenReaderField(int limit) {
 }
 
 
-void UsbPacketReceived(uint8_t *packet, int len) {
-
-       UsbCommand *c = (UsbCommand *)packet;
+void UsbPacketReceived(UsbCommand *c) {
 
 //  Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
 
@@ -1479,10 +1476,13 @@ void  __attribute__((noreturn)) AppMain(void) {
        LCDInit();
 #endif
 
-       uint8_t rx[sizeof(UsbCommand)];
-       size_t rx_len;
-
+       UsbCommand rx;
+  
        for(;;) {
+               if (cmd_receive(&rx)) {
+                       UsbPacketReceived(&rx);
+               }
+
                WDT_HIT();
                if (usb_poll() && (rx_len = usb_read(rx, sizeof(rx)))) {
                        UsbPacketReceived(rx, rx_len);
diff --git a/armsrc/cmd.c b/armsrc/cmd.c
deleted file mode 100644 (file)
index 7120252..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*\r
- * Proxmark send and receive commands\r
- *\r
- * Copyright (c) 2012, Roel Verdult\r
- * All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- * notice, this list of conditions and the following disclaimer.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- * notice, this list of conditions and the following disclaimer in the\r
- * documentation and/or other materials provided with the distribution.\r
- * 3. Neither the name of the copyright holders nor the\r
- * names of its contributors may be used to endorse or promote products\r
- * derived from this software without specific prior written permission.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY\r
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY\r
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
- *\r
- * @file cmd.c\r
- * @brief\r
- */\r
-\r
-#include "cmd.h"\r
-\r
-#include <stddef.h>\r
-#include <stdint.h>\r
-#include <stdbool.h>\r
-#include "common.h"\r
-#include "usb_cmd.h"\r
-#include "usb_cdc.h"\r
-\r
-\r
-bool cmd_receive(UsbCommand* cmd) {\r
-\r
-       // Check if there is a usb packet available\r
-       if (!usb_poll())\r
-               return false;\r
-\r
-       // Try to retrieve the available command frame\r
-       size_t rxlen = usb_read((uint8_t*)cmd, sizeof(UsbCommand));\r
-\r
-       // Check if the transfer was complete\r
-       if (rxlen != sizeof(UsbCommand))\r
-               return false;\r
-\r
-       // Received command successfully\r
-       return true;\r
-}\r
-\r
-\r
-bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len) {\r
-       UsbCommand txcmd;\r
-\r
-       for (size_t i = 0; i < sizeof(UsbCommand); i++) {\r
-               ((uint8_t*)&txcmd)[i] = 0x00;\r
-       }\r
-\r
-       // Compose the outgoing command frame\r
-       txcmd.cmd = cmd;\r
-       txcmd.arg[0] = arg0;\r
-       txcmd.arg[1] = arg1;\r
-       txcmd.arg[2] = arg2;\r
-\r
-       // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE\r
-       if (data && len) {\r
-               len = MIN(len, USB_CMD_DATA_SIZE);\r
-               for (size_t i = 0; i < len; i++) {\r
-                       txcmd.d.asBytes[i] = ((uint8_t*)data)[i];\r
-               }\r
-       }\r
-\r
-       // Send frame and make sure all bytes are transmitted\r
-       if (usb_write((uint8_t*)&txcmd, sizeof(UsbCommand)) != 0) return false;\r
-\r
-       return true;\r
-}\r
diff --git a/armsrc/cmd.h b/armsrc/cmd.h
deleted file mode 100644 (file)
index 98e1374..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*\r
- * Proxmark send and receive commands\r
- *\r
- * Copyright (c) 2010, Roel Verdult\r
- * All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- * notice, this list of conditions and the following disclaimer.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- * notice, this list of conditions and the following disclaimer in the\r
- * documentation and/or other materials provided with the distribution.\r
- * 3. Neither the name of the copyright holders nor the\r
- * names of its contributors may be used to endorse or promote products\r
- * derived from this software without specific prior written permission.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY\r
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY\r
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
- *\r
- * @file cmd.h\r
- * @brief\r
- */\r
-\r
-#ifndef PROXMARK_CMD_H__\r
-#define PROXMARK_CMD_H__\r
-\r
-#include <stddef.h>\r
-#include <stdint.h>\r
-#include <stdbool.h>\r
-#include "usb_cmd.h"\r
-\r
-extern bool cmd_receive(UsbCommand* cmd);\r
-extern bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len);\r
-\r
-#endif // PROXMARK_CMD_H__\r
index 0e999e1ed34b0650559359e83c83d40203879c66..ac907f6bbd87300b700d86fd7060610d2942e63e 100644 (file)
@@ -15,7 +15,7 @@
 #include "iso14443a.h"
 #include "iso14443b.h"
 #include "epa.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "fpgaloader.h"
 #include "string.h"
 #include "util.h"
index 2bb7fbceeb9c9ffc1aa3264092df9c91903dbd09..3a0ac65f504a1bcc2020115777485671a465e27e 100644 (file)
@@ -14,8 +14,7 @@
 #include "BigBuf.h"
 #include "util.h"
 #include "apps.h"
-#include "cmd.h"
-#include "usb_cdc.h"   // for usb_poll_validate_length
+#include "usb_cdc.h"
 #include "fpga.h"
 #include "fpgaloader.h"
 
index 7cdabefaaa4dada3502c516c083c9b391c491af0..688805bea19aa5fbc5592f3c10b9e078e7c8ae66 100644 (file)
@@ -19,7 +19,7 @@
 #include "hitag2.h"
 
 #include "proxmark3.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "apps.h"
 #include "util.h"
 #include "hitag.h"
index e7533da7a7367e05a562133881c9cb56466b93b0..8f40146a6591dcb0c0e3342137d07de60df935d9 100644 (file)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include "proxmark3.h"
 #include "apps.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "util.h"
 #include "hitag.h"
 #include "string.h"
index 30cbddd08927bec89d94c7ed31b74931e7984cfd..3d16b42cea10783cfc27fb7b9b646ffdf58f0a70 100644 (file)
@@ -18,7 +18,7 @@
 #include "mifareutil.h" // for MF_DBGLEVEL
 #include "BigBuf.h"
 #include "apps.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 
 #ifdef WITH_SMARTCARD
 #include "smartcard.h"
index 28cfcaa66c407bf5a54d3c47afe817be5ad1cd71..1f814609e74107c176f4e200a56f31cccd417543 100644 (file)
@@ -24,7 +24,7 @@
 #include "string.h"
 #include "printf.h"
 #include "common.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "iso14443a.h"
 #include "iso15693.h"
 // Needed for CRC in emulation mode;
@@ -34,7 +34,6 @@
 #include "iso15693tools.h"
 #include "protocols.h"
 #include "optimized_cipher.h"
-#include "usb_cdc.h" // for usb_poll_validate_length
 #include "fpgaloader.h"
 
 // iCLASS has a slightly different timing compared to ISO15693. According to the picopass data sheet the tag response is expected 330us after
index 2d6c3e3bf206047bc41d3a760e4ab808294ecebd..a24e7a4704d3b73a381a0c1ab47a64fb425dd3e8 100644 (file)
@@ -17,7 +17,7 @@
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "iso14443crc.h"
 #include "crapto1/crapto1.h"
 #include "mifareutil.h"
index 5a335e25afab1d27076665cbc36a0ea047e82932..0f36c7c7b33c6810371c6333db686d751337ce69 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "proxmark3.h"
 #include "apps.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "util.h"
 #include "string.h"
 #include "iso14443crc.h"
index 351b01846bb20e63d22ac632674ec1d472d42311..9f6516aad3398c5df4524ee1b3c1d377c0b313e4 100644 (file)
@@ -58,7 +58,7 @@
 #include "string.h"
 #include "iso15693tools.h"
 #include "protocols.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "BigBuf.h"
 #include "fpgaloader.h"
 
index 3bc09732d1a231b4de22456a5af02bc7b7de1c27..71ff0321c546208fbda0928bfadaf3184f09c328 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "proxmark3.h"
 #include "apps.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "util.h"
 #include "string.h"
 #include "legic_prng.h"
index a1a31f1a8f17239a3a031ec7d986c1e55ceb8956..995a8810ad6f856772e87a56111c475de9c29473 100644 (file)
@@ -17,8 +17,7 @@
 #include "lfdemod.h"
 #include "lfsampling.h"
 #include "protocols.h"
-#include "cmd.h"
-#include "usb_cdc.h" // for usb_poll_validate_length
+#include "usb_cdc.h"
 #include "fpgaloader.h"
 
 /**
index b9032c5fafc3dd9dff78f973a495648459a48abc..e30a5639aee9273209d4c8d846ccfa4e7830264d 100644 (file)
@@ -18,7 +18,7 @@
 #include <stdint.h>\r
 \r
 #include "proxmark3.h"\r
-#include "cmd.h"\r
+#include "usb_cdc.h"\r
 #include "crapto1/crapto1.h"\r
 #include "iso14443a.h"\r
 #include "BigBuf.h"\r
index 891e0dafcdf5740c39411beb694ae4d0197cce95..b63160c945c3211265fcd7120e93753236894d5e 100644 (file)
@@ -20,7 +20,6 @@
 #include "fpgaloader.h"
 #include "proxmark3.h"
 #include "usb_cdc.h"
-#include "cmd.h"
 #include "protocols.h"
 #include "apps.h"
 
index 4dbcd90434cefabc8cbf579d2e21a9d62e09a6e2..b867c58242d36ac807055fd3e18ff9aed2840c0d 100644 (file)
@@ -18,7 +18,7 @@
 #include "crapto1/crapto1.h"
 #include "mifareutil.h"
 #include "common.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "BigBuf.h"
 #include "fpgaloader.h"
 
index b0f8e4a3868c6f436d9eee1522071a71a00fce92..2fae74cc60f947ca944fac8494b31a07b9b7d5ce 100644 (file)
@@ -1,6 +1,6 @@
 #include "proxmark3.h"
 #include "apps.h"
-#include "cmd.h"
+#include "usb_cdc.h"
 #include "lfsampling.h"
 #include "pcf7931.h"
 #include "util.h"
diff --git a/armsrc/usb_cdc.c b/armsrc/usb_cdc.c
deleted file mode 100644 (file)
index 269d71d..0000000
+++ /dev/null
@@ -1,684 +0,0 @@
-/*\r
- * at91sam7s USB CDC device implementation\r
- *\r
- * Copyright (c) 2012, Roel Verdult\r
- * All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- * notice, this list of conditions and the following disclaimer.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- * notice, this list of conditions and the following disclaimer in the\r
- * documentation and/or other materials provided with the distribution.\r
- * 3. Neither the name of the copyright holders nor the\r
- * names of its contributors may be used to endorse or promote products\r
- * derived from this software without specific prior written permission.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY\r
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY\r
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
- *\r
- * based on the "Basic USB Example" from ATMEL (doc6123.pdf)\r
- *\r
- * @file usb_cdc.c\r
- * @brief\r
- */\r
-\r
-#include "usb_cdc.h"\r
-\r
-#include <stddef.h>\r
-#include <stdint.h>\r
-#include <stdbool.h>\r
-\r
-#include "common.h"\r
-#include "at91sam7s512.h"\r
-#include "config_gpio.h"\r
-\r
-#define AT91C_EP_CONTROL     0\r
-#define AT91C_EP_OUT         1\r
-#define AT91C_EP_IN          2\r
-#define AT91C_EP_NOTIFY      3\r
-#define AT91C_EP_OUT_SIZE 0x40\r
-#define AT91C_EP_IN_SIZE  0x40\r
-\r
-// Language must always be 0.\r
-#define STR_LANGUAGE_CODES 0x00\r
-#define STR_MANUFACTURER   0x01\r
-#define STR_PRODUCT        0x02\r
-\r
-\r
-static const char devDescriptor[] = {\r
-       /* Device descriptor */\r
-       0x12,      // bLength\r
-       0x01,      // bDescriptorType\r
-       0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.0)\r
-       0x02,      // bDeviceClass:    (Communication Device Class)\r
-       0x00,      // bDeviceSubclass: (unused at this time)\r
-       0x00,      // bDeviceProtocol: (unused at this time)\r
-       0x08,      // bMaxPacketSize0\r
-       0xc4,0x9a, // Vendor ID (0x9ac4 = J. Westhues)\r
-       0x8f,0x4b, // Product ID (0x4b8f = Proxmark-3 RFID Instrument)\r
-       0x01,0x00, // Device release number (0001)\r
-       STR_MANUFACTURER,  // iManufacturer\r
-       STR_PRODUCT,       // iProduct\r
-       0x00,      // iSerialNumber\r
-       0x01       // bNumConfigs\r
-};\r
-\r
-\r
-static const char cfgDescriptor[] = {\r
-       /* ============== CONFIGURATION 1 =========== */\r
-       /* Configuration 1 descriptor */\r
-       0x09,   // CbLength\r
-       0x02,   // CbDescriptorType\r
-       0x43,   // CwTotalLength 2 EP + Control\r
-       0x00,\r
-       0x02,   // CbNumInterfaces\r
-       0x01,   // CbConfigurationValue\r
-       0x00,   // CiConfiguration\r
-       0x80,   // CbmAttributes (Bus Powered)\r
-       0x4B,   // CMaxPower (150mA max current drawn from bus)\r
-\r
-       /* Interface 0 Descriptor: Communication Class Interface */\r
-       0x09, // bLength\r
-       0x04, // bDescriptorType\r
-       0x00, // bInterfaceNumber\r
-       0x00, // bAlternateSetting\r
-       0x01, // bNumEndpoints\r
-       0x02, // bInterfaceClass:       Communication Interface Class\r
-       0x02, // bInterfaceSubclass:    Abstract Control Model\r
-       0x01, // bInterfaceProtocol:    Common AT Commands, V.25ter\r
-       0x00, // iInterface\r
-\r
-       /* Header Functional Descriptor */\r
-       0x05, // bFunction Length\r
-       0x24, // bDescriptor type:      CS_INTERFACE\r
-       0x00, // bDescriptor subtype:   Header Functional Descriptor\r
-       0x10, // bcdCDC:1.1\r
-       0x01,\r
-\r
-       /* ACM Functional Descriptor */\r
-       0x04, // bFunctionLength\r
-       0x24, // bDescriptor Type:      CS_INTERFACE\r
-       0x02, // bDescriptor Subtype:   Abstract Control Management Functional Descriptor\r
-       0x02, // bmCapabilities:        D1: Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State\r
-\r
-       /* Union Functional Descriptor */\r
-       0x05, // bFunctionLength\r
-       0x24, // bDescriptorType:       CS_INTERFACE\r
-       0x06, // bDescriptor Subtype:   Union Functional Descriptor\r
-       0x00, // bMasterInterface:      Communication Class Interface\r
-       0x01, // bSlaveInterface0:      Data Class Interface\r
-\r
-       /* Call Management Functional Descriptor */\r
-       0x05, // bFunctionLength\r
-       0x24, // bDescriptor Type:      CS_INTERFACE\r
-       0x01, // bDescriptor Subtype:   Call Management Functional Descriptor\r
-       0x00, // bmCapabilities:        Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself\r
-       0x01, // bDataInterface:        Data Class Interface 1\r
-\r
-       /* Endpoint 1 descriptor */\r
-       0x07,   // bLength\r
-       0x05,   // bDescriptorType\r
-       0x83,   // bEndpointAddress:    Endpoint 03 - IN\r
-       0x03,   // bmAttributes:        INT\r
-       0x08,   // wMaxPacketSize:      8\r
-       0x00,\r
-       0xFF,   // bInterval\r
-\r
-       /* Interface 1 Descriptor: Data Class Interface */\r
-       0x09, // bLength\r
-       0x04, // bDescriptorType\r
-       0x01, // bInterfaceNumber\r
-       0x00, // bAlternateSetting\r
-       0x02, // bNumEndpoints\r
-       0x0A, // bInterfaceClass:       Data Interface Class\r
-       0x00, // bInterfaceSubclass:    not used\r
-       0x00, // bInterfaceProtocol:    No class specific protocol required)\r
-       0x00, // iInterface\r
-\r
-       /* Endpoint 1 descriptor */\r
-       0x07,   // bLength\r
-       0x05,   // bDescriptorType\r
-       0x01,   // bEndpointAddress:    Endpoint 01 - OUT\r
-       0x02,   // bmAttributes:        BULK\r
-       AT91C_EP_OUT_SIZE, // wMaxPacketSize\r
-       0x00,\r
-       0x00,   // bInterval\r
-\r
-       /* Endpoint 2 descriptor */\r
-       0x07,   // bLength\r
-       0x05,   // bDescriptorType\r
-       0x82,   // bEndpointAddress:    Endpoint 02 - IN\r
-       0x02,   // bmAttributes:        BULK\r
-       AT91C_EP_IN_SIZE,   // wMaxPacketSize\r
-       0x00,\r
-       0x00    // bInterval\r
-};\r
-\r
-\r
-static const char StrDescLanguageCodes[] = {\r
-       4,          // Length\r
-       0x03,       // Type is string\r
-       0x09, 0x04  // supported language Code 0 = 0x0409 (English)\r
-};\r
-\r
-\r
-// Note: ModemManager (Linux) ignores Proxmark3 devices by matching the\r
-// manufacturer string "proxmark.org". Don't change this.\r
-static const char StrDescManufacturer[] = {\r
-       26,         // Length\r
-       0x03,       // Type is string\r
-       'p', 0x00,\r
-       'r', 0x00,\r
-       'o', 0x00,\r
-       'x', 0x00,\r
-       'm', 0x00,\r
-       'a', 0x00,\r
-       'r', 0x00,\r
-       'k', 0x00,\r
-       '.', 0x00,\r
-       'o', 0x00,\r
-       'r', 0x00,\r
-       'g', 0x00\r
-};\r
-\r
-\r
-static const char StrDescProduct[] = {\r
-       20,         // Length\r
-       0x03,       // Type is string\r
-       'p', 0x00,\r
-       'r', 0x00,\r
-       'o', 0x00,\r
-       'x', 0x00,\r
-       'm', 0x00,\r
-       'a', 0x00,\r
-       'r', 0x00,\r
-       'k', 0x00,\r
-       '3', 0x00\r
-};\r
-\r
-\r
-const char* getStringDescriptor(uint8_t idx) {\r
-       switch (idx) {\r
-               case STR_LANGUAGE_CODES:\r
-                       return StrDescLanguageCodes;\r
-               case STR_MANUFACTURER:\r
-                       return StrDescManufacturer;\r
-               case STR_PRODUCT:\r
-                       return StrDescProduct;\r
-               default:\r
-                       return NULL;\r
-       }\r
-}\r
-\r
-\r
-// Bitmap for all status bits in CSR which must be written as 1 to cause no effect\r
-#define REG_NO_EFFECT_1_ALL      AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 \\r
-                                                               |AT91C_UDP_STALLSENT   | AT91C_UDP_RXSETUP \\r
-                                                               |AT91C_UDP_TXCOMP\r
-\r
-\r
-// Clear flags in the UDP_CSR register\r
-#define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \\r
-       volatile unsigned int reg; \\r
-       reg = pUdp->UDP_CSR[(endpoint)]; \\r
-       reg |= REG_NO_EFFECT_1_ALL; \\r
-       reg &= ~(flags); \\r
-       pUdp->UDP_CSR[(endpoint)] = reg; \\r
-}\r
-\r
-\r
-// Set flags in the UDP_CSR register\r
-#define UDP_SET_EP_FLAGS(endpoint, flags) { \\r
-       volatile unsigned int reg; \\r
-       reg = pUdp->UDP_CSR[(endpoint)]; \\r
-       reg |= REG_NO_EFFECT_1_ALL; \\r
-       reg |= (flags); \\r
-       pUdp->UDP_CSR[(endpoint)] = reg; \\r
-}\r
-\r
-\r
-/* USB standard request codes */\r
-#define STD_GET_STATUS_ZERO           0x0080\r
-#define STD_GET_STATUS_INTERFACE      0x0081\r
-#define STD_GET_STATUS_ENDPOINT       0x0082\r
-\r
-#define STD_CLEAR_FEATURE_ZERO        0x0100\r
-#define STD_CLEAR_FEATURE_INTERFACE   0x0101\r
-#define STD_CLEAR_FEATURE_ENDPOINT    0x0102\r
-\r
-#define STD_SET_FEATURE_ZERO          0x0300\r
-#define STD_SET_FEATURE_INTERFACE     0x0301\r
-#define STD_SET_FEATURE_ENDPOINT      0x0302\r
-\r
-#define STD_SET_ADDRESS               0x0500\r
-#define STD_GET_DESCRIPTOR            0x0680\r
-#define STD_SET_DESCRIPTOR            0x0700\r
-#define STD_GET_CONFIGURATION         0x0880\r
-#define STD_SET_CONFIGURATION         0x0900\r
-#define STD_GET_INTERFACE             0x0A81\r
-#define STD_SET_INTERFACE             0x0B01\r
-#define STD_SYNCH_FRAME               0x0C82\r
-\r
-/* CDC Class Specific Request Code */\r
-#define GET_LINE_CODING               0x21A1\r
-#define SET_LINE_CODING               0x2021\r
-#define SET_CONTROL_LINE_STATE        0x2221\r
-\r
-\r
-typedef struct {\r
-       unsigned int dwDTERRate;\r
-       char bCharFormat;\r
-       char bParityType;\r
-       char bDataBits;\r
-} AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING;\r
-\r
-\r
-AT91S_CDC_LINE_CODING line = {\r
-       115200, // baudrate\r
-       0,      // 1 Stop Bit\r
-       0,      // None Parity\r
-       8};     // 8 Data bits\r
-\r
-\r
-void AT91F_CDC_Enumerate();\r
-\r
-AT91PS_UDP pUdp = AT91C_BASE_UDP;\r
-uint8_t btConfiguration = 0;\r
-uint8_t btConnection    = 0;\r
-uint8_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    usb_disable\r
-//* \brief This function deactivates the USB device\r
-//*----------------------------------------------------------------------------\r
-void usb_disable() {\r
-       // Disconnect the USB device\r
-       AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;\r
-\r
-       // Clear all lingering interrupts\r
-       if (pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {\r
-               pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;\r
-       }\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    usb_enable\r
-//* \brief This function Activates the USB device\r
-//*----------------------------------------------------------------------------\r
-void usb_enable() {\r
-       // Set the PLL USB Divider\r
-       AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;\r
-\r
-       // Specific Chip USB Initialisation\r
-       // Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock\r
-       AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_UDP;\r
-       AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);\r
-\r
-       // Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO\r
-       // Set in PIO mode and Configure in Output\r
-       AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode\r
-       AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; // Configure as Output\r
-\r
-       // Clear for set the Pullup resistor\r
-       AT91C_BASE_PIOA->PIO_CODR = GPIO_USB_PU;\r
-\r
-       // Disconnect and reconnect USB controller for 100ms\r
-       usb_disable();\r
-\r
-       // Wait for a short while\r
-       for (volatile size_t i = 0; i < 0x100000; i++);\r
-\r
-       // Reconnect USB reconnect\r
-       AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;\r
-       AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    usb_check\r
-//* \brief Test if the device is configured and handle enumeration\r
-//*----------------------------------------------------------------------------\r
-bool usb_check() {\r
-       AT91_REG isr = pUdp->UDP_ISR;\r
-\r
-       if (isr & AT91C_UDP_ENDBUSRES) {\r
-               pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;\r
-               // reset all endpoints\r
-               pUdp->UDP_RSTEP  = (unsigned int)-1;\r
-               pUdp->UDP_RSTEP  = 0;\r
-               // Enable the function\r
-               pUdp->UDP_FADDR = AT91C_UDP_FEN;\r
-               // Configure endpoint 0\r
-               pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);\r
-       } else if (isr & AT91C_UDP_EPINT0) {\r
-               pUdp->UDP_ICR = AT91C_UDP_EPINT0;\r
-               AT91F_CDC_Enumerate();\r
-       }\r
-       return (btConfiguration) ? true : false;\r
-}\r
-\r
-\r
-bool usb_poll() {\r
-       if (!usb_check()) return false;\r
-       return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);\r
-}\r
-\r
-\r
-/**\r
-       In github PR #129, some users appears to get a false positive from\r
-       usb_poll, which returns true, but the usb_read operation\r
-       still returns 0.\r
-       This check is basically the same as above, but also checks\r
-       that the length available to read is non-zero, thus hopefully fixes the\r
-       bug.\r
-**/\r
-bool usb_poll_validate_length() {\r
-       if (!usb_check()) return false;\r
-       if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;\r
-       return (pUdp->UDP_CSR[AT91C_EP_OUT] >> 16) >  0;\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    usb_read\r
-//* \brief Read available data from Endpoint OUT\r
-//*----------------------------------------------------------------------------\r
-uint32_t usb_read(uint8_t* data, size_t len) {\r
-       uint8_t bank = btReceiveBank;\r
-       uint32_t packetSize, nbBytesRcv = 0;\r
-       uint32_t time_out = 0;\r
-\r
-       while (len)  {\r
-               if (!usb_check()) break;\r
-\r
-               if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {\r
-                       packetSize = MIN(pUdp->UDP_CSR[AT91C_EP_OUT] >> 16, len);\r
-                       len -= packetSize;\r
-                       while (packetSize--)\r
-                               data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];\r
-                       UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank);\r
-                       if (bank == AT91C_UDP_RX_DATA_BK0) {\r
-                               bank = AT91C_UDP_RX_DATA_BK1;\r
-                       } else {\r
-                               bank = AT91C_UDP_RX_DATA_BK0;\r
-                       }\r
-               }\r
-               if (time_out++ == 0x1fff) break;\r
-       }\r
-\r
-       btReceiveBank = bank;\r
-       return nbBytesRcv;\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    usb_write\r
-//* \brief Send through endpoint 2\r
-//*----------------------------------------------------------------------------\r
-uint32_t usb_write(const uint8_t* data, const size_t len) {\r
-       size_t length = len;\r
-       uint32_t cpt = 0;\r
-\r
-       if (!length) return 0;\r
-       if (!usb_check()) return 0;\r
-\r
-       // Send the first packet\r
-       cpt = MIN(length, AT91C_EP_IN_SIZE);\r
-       length -= cpt;\r
-       while (cpt--) {\r
-               pUdp->UDP_FDR[AT91C_EP_IN] = *data++;\r
-       }\r
-       UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);\r
-\r
-       while (length) {\r
-               // Fill the next bank\r
-               cpt = MIN(length, AT91C_EP_IN_SIZE);\r
-               length -= cpt;\r
-               while (cpt--) {\r
-                       pUdp->UDP_FDR[AT91C_EP_IN] = *data++;\r
-               }\r
-               // Wait for the previous bank to be sent\r
-               while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
-                       if (!usb_check()) return length;\r
-               }\r
-               UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);\r
-               while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)\r
-                       /* wait */;\r
-               UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);\r
-       }\r
-\r
-       // Wait for the end of transfer\r
-       while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
-               if (!usb_check()) return length;\r
-       }\r
-\r
-       UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);\r
-       while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)\r
-               /* wait */;\r
-\r
-       return length;\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    AT91F_USB_SendData\r
-//* \brief Send Data through the control endpoint\r
-//*----------------------------------------------------------------------------\r
-unsigned int csrTab[100] = {0x00};\r
-unsigned char csrIdx = 0;\r
-\r
-static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {\r
-       uint32_t cpt = 0;\r
-       AT91_REG csr;\r
-\r
-       do {\r
-               cpt = MIN(length, 8);\r
-               length -= cpt;\r
-\r
-               while (cpt--)\r
-                       pUdp->UDP_FDR[0] = *pData++;\r
-\r
-               if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {\r
-                       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);\r
-                       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP)\r
-                               /* wait */;\r
-               }\r
-\r
-               UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);\r
-               do {\r
-                       csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];\r
-\r
-                       // Data IN stage has been stopped by a status OUT\r
-                       if (csr & AT91C_UDP_RX_DATA_BK0) {\r
-                               UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);\r
-                               return;\r
-                       }\r
-               } while (!(csr & AT91C_UDP_TXCOMP));\r
-\r
-       } while (length);\r
-\r
-       if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {\r
-               UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);\r
-               while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP)\r
-                       /* wait */;\r
-       }\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    AT91F_USB_SendZlp\r
-//* \brief Send zero length packet through the control endpoint\r
-//*----------------------------------------------------------------------------\r
-void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {\r
-       UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);\r
-       while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP))\r
-               /* wait */;\r
-       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);\r
-       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP)\r
-               /* wait */;\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    AT91F_USB_SendStall\r
-//* \brief Stall the control endpoint\r
-//*----------------------------------------------------------------------------\r
-void AT91F_USB_SendStall(AT91PS_UDP pUdp) {\r
-       UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);\r
-       while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR))\r
-               /* wait */;\r
-       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR);\r
-       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR))\r
-               /* wait */;\r
-}\r
-\r
-\r
-//*----------------------------------------------------------------------------\r
-//* \fn    AT91F_CDC_Enumerate\r
-//* \brief This function is a callback invoked when a SETUP packet is received\r
-//*----------------------------------------------------------------------------\r
-void AT91F_CDC_Enumerate() {\r
-       uint8_t bmRequestType, bRequest;\r
-       uint16_t wValue, wIndex, wLength, wStatus;\r
-\r
-       if (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP))\r
-               return;\r
-\r
-       bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];\r
-       bRequest      = pUdp->UDP_FDR[AT91C_EP_CONTROL];\r
-       wValue        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);\r
-       wValue       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);\r
-       wIndex        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);\r
-       wIndex       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);\r
-       wLength       = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);\r
-       wLength      |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);\r
-\r
-       if (bmRequestType & 0x80) { // Data Phase Transfer Direction Device to Host\r
-               UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);\r
-               while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR))\r
-                       /* wait */;\r
-       }\r
-       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);\r
-       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)\r
-               /* wait */;\r
-\r
-       // Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1\r
-       switch ((bRequest << 8) | bmRequestType) {\r
-       case STD_GET_DESCRIPTOR:\r
-               if (wValue == 0x100)       // Return Device Descriptor\r
-                       AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));\r
-               else if (wValue == 0x200)  // Return Configuration Descriptor\r
-                       AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));\r
-               else if ((wValue & 0xF00) == 0x300) { // Return String Descriptor\r
-                       const char *strDescriptor = getStringDescriptor(wValue & 0xff);\r
-                       if (strDescriptor != NULL) {\r
-                               AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));\r
-                       } else {\r
-                               AT91F_USB_SendStall(pUdp);\r
-                       }\r
-               }\r
-               else\r
-                       AT91F_USB_SendStall(pUdp);\r
-               break;\r
-       case STD_SET_ADDRESS:\r
-               AT91F_USB_SendZlp(pUdp);\r
-               pUdp->UDP_FADDR = (AT91C_UDP_FEN | wValue);\r
-               pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;\r
-               break;\r
-       case STD_SET_CONFIGURATION:\r
-               btConfiguration = wValue;\r
-               AT91F_USB_SendZlp(pUdp);\r
-               pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;\r
-               pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;\r
-               pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;\r
-               pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;\r
-               break;\r
-       case STD_GET_CONFIGURATION:\r
-               AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));\r
-               break;\r
-       case STD_GET_STATUS_ZERO:\r
-               wStatus = 0;    // Device is Bus powered, remote wakeup disabled\r
-               AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
-               break;\r
-       case STD_GET_STATUS_INTERFACE:\r
-               wStatus = 0;    // reserved for future use\r
-               AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
-               break;\r
-       case STD_GET_STATUS_ENDPOINT:\r
-               wStatus = 0;\r
-               wIndex &= 0x0F;\r
-               if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {\r
-                       wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;\r
-                       AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
-               } else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {\r
-                       wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;\r
-                       AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
-               } else\r
-                       AT91F_USB_SendStall(pUdp);\r
-               break;\r
-       case STD_SET_FEATURE_ZERO:\r
-               AT91F_USB_SendStall(pUdp);\r
-               break;\r
-       case STD_SET_FEATURE_INTERFACE:\r
-               AT91F_USB_SendZlp(pUdp);\r
-               break;\r
-       case STD_SET_FEATURE_ENDPOINT:\r
-               wIndex &= 0x0F;\r
-               if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {\r
-                       pUdp->UDP_CSR[wIndex] = 0;\r
-                       AT91F_USB_SendZlp(pUdp);\r
-               } else\r
-                       AT91F_USB_SendStall(pUdp);\r
-               break;\r
-       case STD_CLEAR_FEATURE_ZERO:\r
-               AT91F_USB_SendStall(pUdp);\r
-               break;\r
-       case STD_CLEAR_FEATURE_INTERFACE:\r
-               AT91F_USB_SendZlp(pUdp);\r
-               break;\r
-       case STD_CLEAR_FEATURE_ENDPOINT:\r
-               wIndex &= 0x0F;\r
-               if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {\r
-                       if (wIndex == AT91C_EP_OUT)\r
-                               pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);\r
-                       else if (wIndex == AT91C_EP_IN)\r
-                               pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);\r
-                       else if (wIndex == AT91C_EP_NOTIFY)\r
-                               pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);\r
-                       AT91F_USB_SendZlp(pUdp);\r
-               }\r
-               else\r
-                       AT91F_USB_SendStall(pUdp);\r
-               break;\r
-\r
-       // handle CDC class requests\r
-       case SET_LINE_CODING:\r
-               while ( (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0))\r
-                       /* wait */;\r
-               UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);\r
-               AT91F_USB_SendZlp(pUdp);\r
-               break;\r
-       case GET_LINE_CODING:\r
-               AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));\r
-               break;\r
-       case SET_CONTROL_LINE_STATE:\r
-               btConnection = wValue;\r
-               AT91F_USB_SendZlp(pUdp);\r
-               break;\r
-       default:\r
-               AT91F_USB_SendStall(pUdp);\r
-               break;\r
-       }\r
-}\r
diff --git a/armsrc/usb_cdc.h b/armsrc/usb_cdc.h
deleted file mode 100644 (file)
index 085b984..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*\r
- * at91sam7s USB CDC device implementation\r
- *\r
- * Copyright (c) 2012, Roel Verdult\r
- * All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- * notice, this list of conditions and the following disclaimer.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- * notice, this list of conditions and the following disclaimer in the\r
- * documentation and/or other materials provided with the distribution.\r
- * 3. Neither the name of the copyright holders nor the\r
- * names of its contributors may be used to endorse or promote products\r
- * derived from this software without specific prior written permission.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY\r
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY\r
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
- *\r
- * based on the "Basic USB Example" from ATMEL (doc6123.pdf)\r
- *\r
- * @file usb_cdc.c\r
- * @brief\r
- */\r
-\r
-#ifndef USB_CDC_H__\r
-#define USB_CDC_H__\r
-\r
-#include <stddef.h>\r
-#include <stdint.h>\r
-#include <stdbool.h>\r
-\r
-extern void usb_disable();\r
-extern void usb_enable();\r
-extern bool usb_check();\r
-extern bool usb_poll();\r
-extern bool usb_poll_validate_length();\r
-extern uint32_t usb_read(uint8_t* data, size_t len);\r
-extern uint32_t usb_write(const uint8_t* data, const size_t len);\r
-\r
-#endif // _USB_CDC_H__\r
index dd1e7e0830877d14d1870549f0d4620b9b1c2c93..b1e2e6cd14a7b00125777156c4ec0deb59c514d4 100644 (file)
@@ -8,7 +8,7 @@
 
 # DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code
 ARMSRC = 
-THUMBSRC = cmd.c usb_cdc.c bootrom.c
+THUMBSRC = usb_cdc.c bootrom.c
 ASMSRC = ram-reset.s flash-reset.s
 VERSIONSRC = version.c
 
index bbea07b53dedf72bd47501ff0639db4bcb80f02b..b2500821728daf00d5ddcad767f41867c1ce81db 100644 (file)
@@ -6,17 +6,15 @@
 // Main code for the bootloader
 //-----------------------------------------------------------------------------
 
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "usb_cdc.h"
-#include "cmd.h"
-//#include "usb_hid.h"
 
 void DbpString(char *str) {
-  byte_t len = 0;
+  uint8_t len = 0;
   while (str[len] != 0x00) {
     len++;
   }
-  cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
+  cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(uint8_t*)str,len);
 }
 
 struct common_area common_area __attribute__((section(".commonarea")));
@@ -89,15 +87,10 @@ static void Fatal(void)
   for(;;);
 }
 
-void UsbPacketReceived(uint8_t *packet, int len) {
+void UsbPacketReceived(UsbCommand *c) {
   int i, dont_ack=0;
-  UsbCommand* c = (UsbCommand *)packet;
   volatile uint32_t *p;
   
-  if(len != sizeof(UsbCommand)) {
-    Fatal();
-  }
-  
   uint32_t arg0 = (uint32_t)c->arg[0];
   
   switch(c->cmd) {
@@ -199,21 +192,17 @@ static void flash_mode(int externally_entered)
        start_addr = 0;
        end_addr = 0;
        bootrom_unlocked = 0;
-  byte_t rx[sizeof(UsbCommand)];
-       size_t rx_len;
+    UsbCommand rx;
 
-  usb_enable();
-  for (volatile size_t i=0; i<0x100000; i++) {};
+       usb_enable();
+       for (volatile size_t i=0; i<0x100000; i++) {};
 
        for(;;) {
                WDT_HIT();
 
-    if (usb_poll()) {
-      rx_len = usb_read(rx,sizeof(UsbCommand));
-      if (rx_len) {
-        UsbPacketReceived(rx,rx_len);
-      }
-    }
+               if (cmd_receive(&rx)) {
+                       UsbPacketReceived(&rx);
+               }
 
                if(!externally_entered && !BUTTON_PRESS()) {
                        /* Perform a reset to leave flash mode */
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
new file mode 100644 (file)
index 0000000..66b02e7
--- /dev/null
@@ -0,0 +1,733 @@
+/*\r
+ * at91sam7s USB CDC device implementation\r
+ *\r
+ * Copyright (c) 2012, Roel Verdult\r
+ * All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions are met:\r
+ * 1. Redistributions of source code must retain the above copyright\r
+ * notice, this list of conditions and the following disclaimer.\r
+ * 2. Redistributions in binary form must reproduce the above copyright\r
+ * notice, this list of conditions and the following disclaimer in the\r
+ * documentation and/or other materials provided with the distribution.\r
+ * 3. Neither the name of the copyright holders nor the\r
+ * names of its contributors may be used to endorse or promote products\r
+ * derived from this software without specific prior written permission.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY\r
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY\r
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
+ *\r
+ * based on the "Basic USB Example" from ATMEL (doc6123.pdf)\r
+ *\r
+ * @file usb_cdc.c\r
+ * @brief\r
+ */\r
+\r
+#include "usb_cdc.h"\r
+\r
+#include <stddef.h>\r
+#include <stdint.h>\r
+#include <stdbool.h>\r
+\r
+#include "common.h"\r
+#include "at91sam7s512.h"\r
+#include "config_gpio.h"\r
+\r
+#define AT91C_EP_CONTROL     0\r
+#define AT91C_EP_OUT         1\r
+#define AT91C_EP_IN          2\r
+#define AT91C_EP_NOTIFY      3\r
+#define AT91C_EP_OUT_SIZE 0x40\r
+#define AT91C_EP_IN_SIZE  0x40\r
+\r
+// Language must always be 0.\r
+#define STR_LANGUAGE_CODES 0x00\r
+#define STR_MANUFACTURER   0x01\r
+#define STR_PRODUCT        0x02\r
+\r
+\r
+static const char devDescriptor[] = {\r
+       /* Device descriptor */\r
+       0x12,      // bLength\r
+       0x01,      // bDescriptorType\r
+       0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.0)\r
+       0x02,      // bDeviceClass:    (Communication Device Class)\r
+       0x00,      // bDeviceSubclass: (unused at this time)\r
+       0x00,      // bDeviceProtocol: (unused at this time)\r
+       0x08,      // bMaxPacketSize0\r
+       0xc4,0x9a, // Vendor ID (0x9ac4 = J. Westhues)\r
+       0x8f,0x4b, // Product ID (0x4b8f = Proxmark-3 RFID Instrument)\r
+       0x01,0x00, // Device release number (0001)\r
+       STR_MANUFACTURER,  // iManufacturer\r
+       STR_PRODUCT,       // iProduct\r
+       0x00,      // iSerialNumber\r
+       0x01       // bNumConfigs\r
+};\r
+\r
+\r
+static const char cfgDescriptor[] = {\r
+       /* ============== CONFIGURATION 1 =========== */\r
+       /* Configuration 1 descriptor */\r
+       0x09,   // CbLength\r
+       0x02,   // CbDescriptorType\r
+       0x43,   // CwTotalLength 2 EP + Control\r
+       0x00,\r
+       0x02,   // CbNumInterfaces\r
+       0x01,   // CbConfigurationValue\r
+       0x00,   // CiConfiguration\r
+       0x80,   // CbmAttributes (Bus Powered)\r
+       0x4B,   // CMaxPower (150mA max current drawn from bus)\r
+\r
+       /* Interface 0 Descriptor: Communication Class Interface */\r
+       0x09, // bLength\r
+       0x04, // bDescriptorType\r
+       0x00, // bInterfaceNumber\r
+       0x00, // bAlternateSetting\r
+       0x01, // bNumEndpoints\r
+       0x02, // bInterfaceClass:       Communication Interface Class\r
+       0x02, // bInterfaceSubclass:    Abstract Control Model\r
+       0x01, // bInterfaceProtocol:    Common AT Commands, V.25ter\r
+       0x00, // iInterface\r
+\r
+       /* Header Functional Descriptor */\r
+       0x05, // bFunction Length\r
+       0x24, // bDescriptor type:      CS_INTERFACE\r
+       0x00, // bDescriptor subtype:   Header Functional Descriptor\r
+       0x10, // bcdCDC:1.1\r
+       0x01,\r
+\r
+       /* ACM Functional Descriptor */\r
+       0x04, // bFunctionLength\r
+       0x24, // bDescriptor Type:      CS_INTERFACE\r
+       0x02, // bDescriptor Subtype:   Abstract Control Management Functional Descriptor\r
+       0x02, // bmCapabilities:        D1: Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State\r
+\r
+       /* Union Functional Descriptor */\r
+       0x05, // bFunctionLength\r
+       0x24, // bDescriptorType:       CS_INTERFACE\r
+       0x06, // bDescriptor Subtype:   Union Functional Descriptor\r
+       0x00, // bMasterInterface:      Communication Class Interface\r
+       0x01, // bSlaveInterface0:      Data Class Interface\r
+\r
+       /* Call Management Functional Descriptor */\r
+       0x05, // bFunctionLength\r
+       0x24, // bDescriptor Type:      CS_INTERFACE\r
+       0x01, // bDescriptor Subtype:   Call Management Functional Descriptor\r
+       0x00, // bmCapabilities:        Device sends/receives call management information only over the Communication Class interface. Device does not handle call management itself\r
+       0x01, // bDataInterface:        Data Class Interface 1\r
+\r
+       /* Endpoint 1 descriptor */\r
+       0x07,   // bLength\r
+       0x05,   // bDescriptorType\r
+       0x83,   // bEndpointAddress:    Endpoint 03 - IN\r
+       0x03,   // bmAttributes:        INT\r
+       0x08,   // wMaxPacketSize:      8\r
+       0x00,\r
+       0xFF,   // bInterval\r
+\r
+       /* Interface 1 Descriptor: Data Class Interface */\r
+       0x09, // bLength\r
+       0x04, // bDescriptorType\r
+       0x01, // bInterfaceNumber\r
+       0x00, // bAlternateSetting\r
+       0x02, // bNumEndpoints\r
+       0x0A, // bInterfaceClass:       Data Interface Class\r
+       0x00, // bInterfaceSubclass:    not used\r
+       0x00, // bInterfaceProtocol:    No class specific protocol required)\r
+       0x00, // iInterface\r
+\r
+       /* Endpoint 1 descriptor */\r
+       0x07,   // bLength\r
+       0x05,   // bDescriptorType\r
+       0x01,   // bEndpointAddress:    Endpoint 01 - OUT\r
+       0x02,   // bmAttributes:        BULK\r
+       AT91C_EP_OUT_SIZE, // wMaxPacketSize\r
+       0x00,\r
+       0x00,   // bInterval\r
+\r
+       /* Endpoint 2 descriptor */\r
+       0x07,   // bLength\r
+       0x05,   // bDescriptorType\r
+       0x82,   // bEndpointAddress:    Endpoint 02 - IN\r
+       0x02,   // bmAttributes:        BULK\r
+       AT91C_EP_IN_SIZE,   // wMaxPacketSize\r
+       0x00,\r
+       0x00    // bInterval\r
+};\r
+\r
+\r
+static const char StrDescLanguageCodes[] = {\r
+       4,          // Length\r
+       0x03,       // Type is string\r
+       0x09, 0x04  // supported language Code 0 = 0x0409 (English)\r
+};\r
+\r
+\r
+// Note: ModemManager (Linux) ignores Proxmark3 devices by matching the\r
+// manufacturer string "proxmark.org". Don't change this.\r
+static const char StrDescManufacturer[] = {\r
+       26,         // Length\r
+       0x03,       // Type is string\r
+       'p', 0x00,\r
+       'r', 0x00,\r
+       'o', 0x00,\r
+       'x', 0x00,\r
+       'm', 0x00,\r
+       'a', 0x00,\r
+       'r', 0x00,\r
+       'k', 0x00,\r
+       '.', 0x00,\r
+       'o', 0x00,\r
+       'r', 0x00,\r
+       'g', 0x00\r
+};\r
+\r
+\r
+static const char StrDescProduct[] = {\r
+       20,         // Length\r
+       0x03,       // Type is string\r
+       'p', 0x00,\r
+       'r', 0x00,\r
+       'o', 0x00,\r
+       'x', 0x00,\r
+       'm', 0x00,\r
+       'a', 0x00,\r
+       'r', 0x00,\r
+       'k', 0x00,\r
+       '3', 0x00\r
+};\r
+\r
+\r
+static const char* getStringDescriptor(uint8_t idx) {\r
+       switch (idx) {\r
+               case STR_LANGUAGE_CODES:\r
+                       return StrDescLanguageCodes;\r
+               case STR_MANUFACTURER:\r
+                       return StrDescManufacturer;\r
+               case STR_PRODUCT:\r
+                       return StrDescProduct;\r
+               default:\r
+                       return NULL;\r
+       }\r
+}\r
+\r
+\r
+// Bitmap for all status bits in CSR which must be written as 1 to cause no effect\r
+#define REG_NO_EFFECT_1_ALL      AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 \\r
+                                                               |AT91C_UDP_STALLSENT   | AT91C_UDP_RXSETUP \\r
+                                                               |AT91C_UDP_TXCOMP\r
+\r
+\r
+// Clear flags in the UDP_CSR register\r
+#define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \\r
+       volatile unsigned int reg; \\r
+       reg = pUdp->UDP_CSR[(endpoint)]; \\r
+       reg |= REG_NO_EFFECT_1_ALL; \\r
+       reg &= ~(flags); \\r
+       pUdp->UDP_CSR[(endpoint)] = reg; \\r
+}\r
+\r
+\r
+// Set flags in the UDP_CSR register\r
+#define UDP_SET_EP_FLAGS(endpoint, flags) { \\r
+       volatile unsigned int reg; \\r
+       reg = pUdp->UDP_CSR[(endpoint)]; \\r
+       reg |= REG_NO_EFFECT_1_ALL; \\r
+       reg |= (flags); \\r
+       pUdp->UDP_CSR[(endpoint)] = reg; \\r
+}\r
+\r
+\r
+/* USB standard request codes */\r
+#define STD_GET_STATUS_ZERO           0x0080\r
+#define STD_GET_STATUS_INTERFACE      0x0081\r
+#define STD_GET_STATUS_ENDPOINT       0x0082\r
+\r
+#define STD_CLEAR_FEATURE_ZERO        0x0100\r
+#define STD_CLEAR_FEATURE_INTERFACE   0x0101\r
+#define STD_CLEAR_FEATURE_ENDPOINT    0x0102\r
+\r
+#define STD_SET_FEATURE_ZERO          0x0300\r
+#define STD_SET_FEATURE_INTERFACE     0x0301\r
+#define STD_SET_FEATURE_ENDPOINT      0x0302\r
+\r
+#define STD_SET_ADDRESS               0x0500\r
+#define STD_GET_DESCRIPTOR            0x0680\r
+#define STD_SET_DESCRIPTOR            0x0700\r
+#define STD_GET_CONFIGURATION         0x0880\r
+#define STD_SET_CONFIGURATION         0x0900\r
+#define STD_GET_INTERFACE             0x0A81\r
+#define STD_SET_INTERFACE             0x0B01\r
+#define STD_SYNCH_FRAME               0x0C82\r
+\r
+/* CDC Class Specific Request Code */\r
+#define GET_LINE_CODING               0x21A1\r
+#define SET_LINE_CODING               0x2021\r
+#define SET_CONTROL_LINE_STATE        0x2221\r
+\r
+\r
+typedef struct {\r
+       unsigned int dwDTERRate;\r
+       char bCharFormat;\r
+       char bParityType;\r
+       char bDataBits;\r
+} AT91S_CDC_LINE_CODING, *AT91PS_CDC_LINE_CODING;\r
+\r
+\r
+AT91S_CDC_LINE_CODING line = {\r
+       115200, // baudrate\r
+       0,      // 1 Stop Bit\r
+       0,      // None Parity\r
+       8};     // 8 Data bits\r
+\r
+\r
+static void AT91F_CDC_Enumerate();\r
+\r
+AT91PS_UDP pUdp = AT91C_BASE_UDP;\r
+uint8_t btConfiguration = 0;\r
+uint8_t btConnection    = 0;\r
+uint8_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    usb_disable\r
+//* \brief This function deactivates the USB device\r
+//*----------------------------------------------------------------------------\r
+void usb_disable() {\r
+       // Disconnect the USB device\r
+       AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;\r
+\r
+       // Clear all lingering interrupts\r
+       if (pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {\r
+               pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;\r
+       }\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    usb_enable\r
+//* \brief This function Activates the USB device\r
+//*----------------------------------------------------------------------------\r
+void usb_enable() {\r
+       // Set the PLL USB Divider\r
+       AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;\r
+\r
+       // Specific Chip USB Initialisation\r
+       // Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock\r
+       AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_UDP;\r
+       AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);\r
+\r
+       // Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO\r
+       // Set in PIO mode and Configure in Output\r
+       AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode\r
+       AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; // Configure as Output\r
+\r
+       // Clear for set the Pullup resistor\r
+       AT91C_BASE_PIOA->PIO_CODR = GPIO_USB_PU;\r
+\r
+       // Disconnect and reconnect USB controller for 100ms\r
+       usb_disable();\r
+\r
+       // Wait for a short while\r
+       for (volatile size_t i = 0; i < 0x100000; i++);\r
+\r
+       // Reconnect USB reconnect\r
+       AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;\r
+       AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    usb_check\r
+//* \brief Test if the device is configured and handle enumeration\r
+//*----------------------------------------------------------------------------\r
+static bool usb_check() {\r
+       AT91_REG isr = pUdp->UDP_ISR;\r
+\r
+       if (isr & AT91C_UDP_ENDBUSRES) {\r
+               pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;\r
+               // reset all endpoints\r
+               pUdp->UDP_RSTEP  = (unsigned int)-1;\r
+               pUdp->UDP_RSTEP  = 0;\r
+               // Enable the function\r
+               pUdp->UDP_FADDR = AT91C_UDP_FEN;\r
+               // Configure endpoint 0\r
+               pUdp->UDP_CSR[AT91C_EP_CONTROL] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_CTRL);\r
+       } else if (isr & AT91C_UDP_EPINT0) {\r
+               pUdp->UDP_ICR = AT91C_UDP_EPINT0;\r
+               AT91F_CDC_Enumerate();\r
+       }\r
+       return (btConfiguration) ? true : false;\r
+}\r
+\r
+\r
+bool usb_poll() {\r
+       if (!usb_check()) return false;\r
+       return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);\r
+}\r
+\r
+\r
+/**\r
+       In github PR #129, some users appears to get a false positive from\r
+       usb_poll, which returns true, but the usb_read operation\r
+       still returns 0.\r
+       This check is basically the same as above, but also checks\r
+       that the length available to read is non-zero, thus hopefully fixes the\r
+       bug.\r
+**/\r
+bool usb_poll_validate_length() {\r
+       if (!usb_check()) return false;\r
+       if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;\r
+       return (pUdp->UDP_CSR[AT91C_EP_OUT] >> 16) >  0;\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    usb_read\r
+//* \brief Read available data from Endpoint OUT\r
+//*----------------------------------------------------------------------------\r
+static uint32_t usb_read(uint8_t* data, size_t len) {\r
+       uint8_t bank = btReceiveBank;\r
+       uint32_t packetSize, nbBytesRcv = 0;\r
+       uint32_t time_out = 0;\r
+\r
+       while (len)  {\r
+               if (!usb_check()) break;\r
+\r
+               if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {\r
+                       packetSize = MIN(pUdp->UDP_CSR[AT91C_EP_OUT] >> 16, len);\r
+                       len -= packetSize;\r
+                       while (packetSize--)\r
+                               data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];\r
+                       UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank);\r
+                       if (bank == AT91C_UDP_RX_DATA_BK0) {\r
+                               bank = AT91C_UDP_RX_DATA_BK1;\r
+                       } else {\r
+                               bank = AT91C_UDP_RX_DATA_BK0;\r
+                       }\r
+               }\r
+               if (time_out++ == 0x1fff) break;\r
+       }\r
+\r
+       btReceiveBank = bank;\r
+       return nbBytesRcv;\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    usb_write\r
+//* \brief Send through endpoint 2\r
+//*----------------------------------------------------------------------------\r
+static uint32_t usb_write(const uint8_t* data, const size_t len) {\r
+       size_t length = len;\r
+       uint32_t cpt = 0;\r
+\r
+       if (!length) return 0;\r
+       if (!usb_check()) return 0;\r
+\r
+       // Send the first packet\r
+       cpt = MIN(length, AT91C_EP_IN_SIZE);\r
+       length -= cpt;\r
+       while (cpt--) {\r
+               pUdp->UDP_FDR[AT91C_EP_IN] = *data++;\r
+       }\r
+       UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);\r
+\r
+       while (length) {\r
+               // Fill the next bank\r
+               cpt = MIN(length, AT91C_EP_IN_SIZE);\r
+               length -= cpt;\r
+               while (cpt--) {\r
+                       pUdp->UDP_FDR[AT91C_EP_IN] = *data++;\r
+               }\r
+               // Wait for the previous bank to be sent\r
+               while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
+                       if (!usb_check()) return length;\r
+               }\r
+               UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);\r
+               while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)\r
+                       /* wait */;\r
+               UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY);\r
+       }\r
+\r
+       // Wait for the end of transfer\r
+       while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
+               if (!usb_check()) return length;\r
+       }\r
+\r
+       UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP);\r
+       while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)\r
+               /* wait */;\r
+\r
+       return length;\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    AT91F_USB_SendData\r
+//* \brief Send Data through the control endpoint\r
+//*----------------------------------------------------------------------------\r
+static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {\r
+       uint32_t cpt = 0;\r
+       AT91_REG csr;\r
+\r
+       do {\r
+               cpt = MIN(length, 8);\r
+               length -= cpt;\r
+\r
+               while (cpt--)\r
+                       pUdp->UDP_FDR[0] = *pData++;\r
+\r
+               if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {\r
+                       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);\r
+                       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP)\r
+                               /* wait */;\r
+               }\r
+\r
+               UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);\r
+               do {\r
+                       csr = pUdp->UDP_CSR[AT91C_EP_CONTROL];\r
+\r
+                       // Data IN stage has been stopped by a status OUT\r
+                       if (csr & AT91C_UDP_RX_DATA_BK0) {\r
+                               UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);\r
+                               return;\r
+                       }\r
+               } while (!(csr & AT91C_UDP_TXCOMP));\r
+\r
+       } while (length);\r
+\r
+       if (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP) {\r
+               UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);\r
+               while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP)\r
+                       /* wait */;\r
+       }\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    AT91F_USB_SendZlp\r
+//* \brief Send zero length packet through the control endpoint\r
+//*----------------------------------------------------------------------------\r
+static void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {\r
+       UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXPKTRDY);\r
+       while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP))\r
+               /* wait */;\r
+       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_TXCOMP);\r
+       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_TXCOMP)\r
+               /* wait */;\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    AT91F_USB_SendStall\r
+//* \brief Stall the control endpoint\r
+//*----------------------------------------------------------------------------\r
+static void AT91F_USB_SendStall(AT91PS_UDP pUdp) {\r
+       UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL);\r
+       while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_ISOERROR))\r
+               /* wait */;\r
+       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR);\r
+       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR))\r
+               /* wait */;\r
+}\r
+\r
+\r
+//*----------------------------------------------------------------------------\r
+//* \fn    AT91F_CDC_Enumerate\r
+//* \brief This function is a callback invoked when a SETUP packet is received\r
+//*----------------------------------------------------------------------------\r
+static void AT91F_CDC_Enumerate() {\r
+       uint8_t bmRequestType, bRequest;\r
+       uint16_t wValue, wIndex, wLength, wStatus;\r
+\r
+       if (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP))\r
+               return;\r
+\r
+       bmRequestType = pUdp->UDP_FDR[AT91C_EP_CONTROL];\r
+       bRequest      = pUdp->UDP_FDR[AT91C_EP_CONTROL];\r
+       wValue        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);\r
+       wValue       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);\r
+       wIndex        = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);\r
+       wIndex       |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);\r
+       wLength       = (pUdp->UDP_FDR[AT91C_EP_CONTROL] & 0xFF);\r
+       wLength      |= (pUdp->UDP_FDR[AT91C_EP_CONTROL] << 8);\r
+\r
+       if (bmRequestType & 0x80) { // Data Phase Transfer Direction Device to Host\r
+               UDP_SET_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_DIR);\r
+               while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_DIR))\r
+                       /* wait */;\r
+       }\r
+       UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RXSETUP);\r
+       while (pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP)\r
+               /* wait */;\r
+\r
+       // Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1\r
+       switch ((bRequest << 8) | bmRequestType) {\r
+       case STD_GET_DESCRIPTOR:\r
+               if (wValue == 0x100)       // Return Device Descriptor\r
+                       AT91F_USB_SendData(pUdp, devDescriptor, MIN(sizeof(devDescriptor), wLength));\r
+               else if (wValue == 0x200)  // Return Configuration Descriptor\r
+                       AT91F_USB_SendData(pUdp, cfgDescriptor, MIN(sizeof(cfgDescriptor), wLength));\r
+               else if ((wValue & 0xF00) == 0x300) { // Return String Descriptor\r
+                       const char *strDescriptor = getStringDescriptor(wValue & 0xff);\r
+                       if (strDescriptor != NULL) {\r
+                               AT91F_USB_SendData(pUdp, strDescriptor, MIN(strDescriptor[0], wLength));\r
+                       } else {\r
+                               AT91F_USB_SendStall(pUdp);\r
+                       }\r
+               }\r
+               else\r
+                       AT91F_USB_SendStall(pUdp);\r
+               break;\r
+       case STD_SET_ADDRESS:\r
+               AT91F_USB_SendZlp(pUdp);\r
+               pUdp->UDP_FADDR = (AT91C_UDP_FEN | wValue);\r
+               pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_FADDEN : 0;\r
+               break;\r
+       case STD_SET_CONFIGURATION:\r
+               btConfiguration = wValue;\r
+               AT91F_USB_SendZlp(pUdp);\r
+               pUdp->UDP_GLBSTATE  = (wValue) ? AT91C_UDP_CONFG : AT91C_UDP_FADDEN;\r
+               pUdp->UDP_CSR[AT91C_EP_OUT]    = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT) : 0;\r
+               pUdp->UDP_CSR[AT91C_EP_IN]     = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN)  : 0;\r
+               pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (wValue) ? (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN)   : 0;\r
+               break;\r
+       case STD_GET_CONFIGURATION:\r
+               AT91F_USB_SendData(pUdp, (char *) &(btConfiguration), sizeof(btConfiguration));\r
+               break;\r
+       case STD_GET_STATUS_ZERO:\r
+               wStatus = 0;    // Device is Bus powered, remote wakeup disabled\r
+               AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
+               break;\r
+       case STD_GET_STATUS_INTERFACE:\r
+               wStatus = 0;    // reserved for future use\r
+               AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
+               break;\r
+       case STD_GET_STATUS_ENDPOINT:\r
+               wStatus = 0;\r
+               wIndex &= 0x0F;\r
+               if ((pUdp->UDP_GLBSTATE & AT91C_UDP_CONFG) && (wIndex <= AT91C_EP_NOTIFY)) {\r
+                       wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;\r
+                       AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
+               } else if ((pUdp->UDP_GLBSTATE & AT91C_UDP_FADDEN) && (wIndex == AT91C_EP_CONTROL)) {\r
+                       wStatus = (pUdp->UDP_CSR[wIndex] & AT91C_UDP_EPEDS) ? 0 : 1;\r
+                       AT91F_USB_SendData(pUdp, (char *) &wStatus, sizeof(wStatus));\r
+               } else\r
+                       AT91F_USB_SendStall(pUdp);\r
+               break;\r
+       case STD_SET_FEATURE_ZERO:\r
+               AT91F_USB_SendStall(pUdp);\r
+               break;\r
+       case STD_SET_FEATURE_INTERFACE:\r
+               AT91F_USB_SendZlp(pUdp);\r
+               break;\r
+       case STD_SET_FEATURE_ENDPOINT:\r
+               wIndex &= 0x0F;\r
+               if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {\r
+                       pUdp->UDP_CSR[wIndex] = 0;\r
+                       AT91F_USB_SendZlp(pUdp);\r
+               } else\r
+                       AT91F_USB_SendStall(pUdp);\r
+               break;\r
+       case STD_CLEAR_FEATURE_ZERO:\r
+               AT91F_USB_SendStall(pUdp);\r
+               break;\r
+       case STD_CLEAR_FEATURE_INTERFACE:\r
+               AT91F_USB_SendZlp(pUdp);\r
+               break;\r
+       case STD_CLEAR_FEATURE_ENDPOINT:\r
+               wIndex &= 0x0F;\r
+               if ((wValue == 0) && (wIndex >= AT91C_EP_OUT) && (wIndex <= AT91C_EP_NOTIFY)) {\r
+                       if (wIndex == AT91C_EP_OUT)\r
+                               pUdp->UDP_CSR[AT91C_EP_OUT] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_OUT);\r
+                       else if (wIndex == AT91C_EP_IN)\r
+                               pUdp->UDP_CSR[AT91C_EP_IN] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_BULK_IN);\r
+                       else if (wIndex == AT91C_EP_NOTIFY)\r
+                               pUdp->UDP_CSR[AT91C_EP_NOTIFY] = (AT91C_UDP_EPEDS | AT91C_UDP_EPTYPE_INT_IN);\r
+                       AT91F_USB_SendZlp(pUdp);\r
+               }\r
+               else\r
+                       AT91F_USB_SendStall(pUdp);\r
+               break;\r
+\r
+       // handle CDC class requests\r
+       case SET_LINE_CODING:\r
+               while (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RX_DATA_BK0))\r
+                       /* wait */;\r
+               UDP_CLEAR_EP_FLAGS(AT91C_EP_CONTROL, AT91C_UDP_RX_DATA_BK0);\r
+               AT91F_USB_SendZlp(pUdp);\r
+               break;\r
+       case GET_LINE_CODING:\r
+               AT91F_USB_SendData(pUdp, (char *) &line, MIN(sizeof(line), wLength));\r
+               break;\r
+       case SET_CONTROL_LINE_STATE:\r
+               btConnection = wValue;\r
+               AT91F_USB_SendZlp(pUdp);\r
+               break;\r
+       default:\r
+               AT91F_USB_SendStall(pUdp);\r
+               break;\r
+       }\r
+}\r
+\r
+\r
+//***************************************************************************\r
+// Interface to the main program\r
+//***************************************************************************\r
+\r
+// The function to receive a command from the client via USB\r
+bool cmd_receive(UsbCommand* cmd) {\r
+\r
+       // Check if there is a usb packet available\r
+       if (!usb_poll())\r
+               return false;\r
+\r
+       // Try to retrieve the available command frame\r
+       size_t rxlen = usb_read((uint8_t*)cmd, sizeof(UsbCommand));\r
+\r
+       // Check if the transfer was complete\r
+       if (rxlen != sizeof(UsbCommand))\r
+               return false;\r
+\r
+       // Received command successfully\r
+       return true;\r
+}\r
+\r
+\r
+// The function to send a response to the client via USB\r
+bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len) {\r
+       UsbCommand txcmd;\r
+\r
+       for (size_t i = 0; i < sizeof(UsbCommand); i++) {\r
+               ((uint8_t*)&txcmd)[i] = 0x00;\r
+       }\r
+\r
+       // Compose the outgoing command frame\r
+       txcmd.cmd = cmd;\r
+       txcmd.arg[0] = arg0;\r
+       txcmd.arg[1] = arg1;\r
+       txcmd.arg[2] = arg2;\r
+\r
+       // Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE\r
+       if (data && len) {\r
+               len = MIN(len, USB_CMD_DATA_SIZE);\r
+               for (size_t i = 0; i < len; i++) {\r
+                       txcmd.d.asBytes[i] = ((uint8_t*)data)[i];\r
+               }\r
+       }\r
+\r
+       // Send frame and make sure all bytes are transmitted\r
+       if (usb_write((uint8_t*)&txcmd, sizeof(UsbCommand)) != 0) return false;\r
+\r
+       return true;\r
+}\r
diff --git a/common/usb_cdc.h b/common/usb_cdc.h
new file mode 100644 (file)
index 0000000..3139922
--- /dev/null
@@ -0,0 +1,50 @@
+/*\r
+ * at91sam7s USB CDC device implementation\r
+ *\r
+ * Copyright (c) 2012, Roel Verdult\r
+ * All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions are met:\r
+ * 1. Redistributions of source code must retain the above copyright\r
+ * notice, this list of conditions and the following disclaimer.\r
+ * 2. Redistributions in binary form must reproduce the above copyright\r
+ * notice, this list of conditions and the following disclaimer in the\r
+ * documentation and/or other materials provided with the distribution.\r
+ * 3. Neither the name of the copyright holders nor the\r
+ * names of its contributors may be used to endorse or promote products\r
+ * derived from this software without specific prior written permission.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY\r
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY\r
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
+ *\r
+ * based on the "Basic USB Example" from ATMEL (doc6123.pdf)\r
+ *\r
+ * @file usb_cdc.c\r
+ * @brief\r
+ */\r
+\r
+#ifndef USB_CDC_H__\r
+#define USB_CDC_H__\r
+\r
+#include <stddef.h>\r
+#include <stdint.h>\r
+#include <stdbool.h>\r
+#include "usb_cmd.h"\r
+\r
+extern void usb_disable();\r
+extern void usb_enable();\r
+extern bool usb_poll();\r
+extern bool usb_poll_validate_length();\r
+extern bool cmd_receive(UsbCommand* cmd);\r
+extern bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len);\r
+\r
+#endif // USB_CDC_H__\r
Impressum, Datenschutz