fixed 64-bit cmd/arg for windows

[proxmark3-svn] / armsrc / usb_cdc.c

diff --git a/armsrc/usb_cdc.c b/armsrc/usb_cdc.c
index c3975f1d5832cbfdee3e3cfae309f6bef3bfed8d..b8aee5a498a29c31a33539b7f69632c9018d52a0 100644 (file)
--- a/armsrc/usb_cdc.c
+++ b/armsrc/usb_cdc.c
@@ -33,6 +33,7 @@
  */\r
 \r
 #include "usb_cdc.h"\r
  */\r
 \r
 #include "usb_cdc.h"\r

+#include "util.h"\r

 \r
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))\r
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))\r
 \r
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))\r
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))\r


@@ -50,8 +51,8 @@ const char devDescriptor[] = {
        0x00,      // bDeviceSubclass: CDC class sub code\r
        0x00,      // bDeviceProtocol: CDC Device protocol\r
        0x08,      // bMaxPacketSize0\r
        0x00,      // bDeviceSubclass: CDC class sub code\r
        0x00,      // bDeviceProtocol: CDC Device protocol\r
        0x08,      // bMaxPacketSize0\r

-       0xeb,0x03, // Vendor ID (random numbers)\r
-       0x25,0x61, // Product ID (random numbers)\r
+       0x2d,0x2d, // Vendor ID (--)\r
+       0x4d,0x50, // Product ID (PM), transmitted in reverse\r

        0x01,0x00, // Device release number (0001)\r
        0x01,      // iManufacturer    // 0x01\r
        0x00,      // iProduct\r
        0x01,0x00, // Device release number (0001)\r
        0x01,      // iManufacturer    // 0x01\r
        0x00,      // iProduct\r


@@ -215,12 +216,26 @@ byte_t btConfiguration = 0;
 byte_t btConnection    = 0;\r
 byte_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;\r
 \r
 byte_t btConnection    = 0;\r
 byte_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;\r
 \r

+//*----------------------------------------------------------------------------\r
+//* \fn    AT91F_USB_Disable\r
+//* \brief This function deactivates the USB device\r
+//*----------------------------------------------------------------------------\r
+void usb_disable() {\r
+  // Disconnect and reconnect USB controller for 100ms\r
+  AT91C_BASE_PIOA->PIO_ODR = AT91C_PIO_PA24;\r
+  SpinDelay(100);\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
 //* \fn    AT91F_USB_Enable\r
 //* \brief This function Activates the USB device\r
 //*----------------------------------------------------------------------------\r
 //*----------------------------------------------------------------------------\r
 //* \fn    AT91F_USB_Enable\r
 //* \brief This function Activates the USB device\r
 //*----------------------------------------------------------------------------\r

-void usb_enable()\r
-{\r
+void usb_enable() {\r

   // Set the PLL USB Divider\r
   AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;\r
   \r
   // Set the PLL USB Divider\r
   AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;\r
   \r


@@ -236,14 +251,23 @@ void usb_enable()
   \r
   // Clear for set the Pul up resistor\r
        AT91C_BASE_PIOA->PIO_CODR = AT91C_PIO_PA16;\r
   \r
   // Clear for set the Pul up resistor\r
        AT91C_BASE_PIOA->PIO_CODR = AT91C_PIO_PA16;\r

+  \r
+  // Disconnect and USB device\r
+  usb_disable();\r
+  \r
+  // Wait for a short while\r
+  SpinDelay(100);\r
+\r
+  // Reconnect USB reconnect\r
+  AT91C_BASE_PIOA->PIO_SODR = AT91C_PIO_PA24;\r
+  AT91C_BASE_PIOA->PIO_OER = AT91C_PIO_PA24;\r

 }\r
 \r
 //*----------------------------------------------------------------------------\r
 //* \fn    AT91F_UDP_IsConfigured\r
 //* \brief Test if the device is configured and handle enumeration\r
 //*----------------------------------------------------------------------------\r
 }\r
 \r
 //*----------------------------------------------------------------------------\r
 //* \fn    AT91F_UDP_IsConfigured\r
 //* \brief Test if the device is configured and handle enumeration\r
 //*----------------------------------------------------------------------------\r

-bool usb_check()\r
-{\r
+bool usb_check() {\r

        AT91_REG isr = pUdp->UDP_ISR;\r
 \r
        if (isr & AT91C_UDP_ENDBUSRES) {\r
        AT91_REG isr = pUdp->UDP_ISR;\r
 \r
        if (isr & AT91C_UDP_ENDBUSRES) {\r


@@ -274,8 +298,7 @@ bool usb_poll()
 //* \fn    AT91F_UDP_Read\r
 //* \brief Read available data from Endpoint OUT\r
 //*----------------------------------------------------------------------------\r
 //* \fn    AT91F_UDP_Read\r
 //* \brief Read available data from Endpoint OUT\r
 //*----------------------------------------------------------------------------\r

-uint32_t usb_read(byte_t* data, size_t len)\r
-{\r
+uint32_t usb_read(byte_t* data, size_t len) {\r

   byte_t bank = btReceiveBank;\r
        uint32_t packetSize, nbBytesRcv = 0;\r
   uint32_t time_out = 0;\r
   byte_t bank = btReceiveBank;\r
        uint32_t packetSize, nbBytesRcv = 0;\r
   uint32_t time_out = 0;\r


@@ -308,8 +331,7 @@ uint32_t usb_read(byte_t* data, size_t len)
 //* \fn    AT91F_CDC_Write\r
 //* \brief Send through endpoint 2\r
 //*----------------------------------------------------------------------------\r
 //* \fn    AT91F_CDC_Write\r
 //* \brief Send through endpoint 2\r
 //*----------------------------------------------------------------------------\r

-uint32_t usb_write(const byte_t* data, const size_t len)\r
-{\r
+uint32_t usb_write(const byte_t* data, const size_t len) {\r

   size_t length = len;\r
        uint32_t cpt = 0;\r
 \r
   size_t length = len;\r
        uint32_t cpt = 0;\r
 \r


@@ -354,8 +376,7 @@ uint32_t usb_write(const byte_t* data, const size_t len)
 unsigned int csrTab[100];\r
 unsigned char csrIdx = 0;\r
 \r
 unsigned int csrTab[100];\r
 unsigned char csrIdx = 0;\r
 \r

-static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length)\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
        uint32_t cpt = 0;\r
        AT91_REG csr;\r
 \r


@@ -394,8 +415,7 @@ static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t leng
 //* \fn    AT91F_USB_SendZlp\r
 //* \brief Send zero length packet through the control endpoint\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
-{\r
+void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {\r

        pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;\r
        while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) );\r
        pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r
        pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;\r
        while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) );\r
        pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r


@@ -406,8 +426,7 @@ void AT91F_USB_SendZlp(AT91PS_UDP pUdp)
 //* \fn    AT91F_USB_SendStall\r
 //* \brief Stall the control endpoint\r
 //*----------------------------------------------------------------------------\r
 //* \fn    AT91F_USB_SendStall\r
 //* \brief Stall the control endpoint\r
 //*----------------------------------------------------------------------------\r

-void AT91F_USB_SendStall(AT91PS_UDP pUdp)\r
-{\r
+void AT91F_USB_SendStall(AT91PS_UDP pUdp) {\r

        pUdp->UDP_CSR[0] |= AT91C_UDP_FORCESTALL;\r
        while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_ISOERROR) );\r
        pUdp->UDP_CSR[0] &= ~(AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR);\r
        pUdp->UDP_CSR[0] |= AT91C_UDP_FORCESTALL;\r
        while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_ISOERROR) );\r
        pUdp->UDP_CSR[0] &= ~(AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR);\r


@@ -418,8 +437,7 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp)
 //* \fn    AT91F_CDC_Enumerate\r
 //* \brief This function is a callback invoked when a SETUP packet is received\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
-{\r
+void AT91F_CDC_Enumerate() {\r

        byte_t bmRequestType, bRequest;\r
        uint16_t wValue, wIndex, wLength, wStatus;\r
 \r
        byte_t bmRequestType, bRequest;\r
        uint16_t wValue, wIndex, wLength, wStatus;\r
 \r