X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a11ca2f3057416c07ca03b24ff16229f67d1b3f8..057d2e9147bc7d8fb3f7c4d7928e66e23fd58e50:/common/usb_cdc.c
diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 79f34979..9d621777 100644
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -46,7 +46,8 @@ const char devDescriptor[] = {
/* Device descriptor */
0x12, // bLength
0x01, // bDescriptorType
- 0x10,0x01, // Complies with USB Spec. Release (0110h = release 1.10)
+ //0x10,0x01, // Complies with USB Spec. Release (0110h = release 1.10)
+ 0x00,0x02, // Complies with USB Spec. Release (0110h = release 2.00)
0x02, // bDeviceClass: CDC class code
0x00, // bDeviceSubclass: CDC class sub code
0x00, // bDeviceProtocol: CDC Device protocol
@@ -56,7 +57,7 @@ const char devDescriptor[] = {
0x01,0x00, // Device release number (0001)
0x01, // iManufacturer // 0x01
0x00, // iProduct
- 0x00, // SerialNumber
+ 0xFD, // SerialNumber
0x01 // bNumConfigs
};
@@ -71,7 +72,7 @@ const char cfgDescriptor[] = {
0x01, // CbConfigurationValue
0x00, // CiConfiguration
0xC0, // CbmAttributes 0xA0
- 0x00, // CMaxPower
+ 0xFA, // CMaxPower
/* Communication Class Interface Descriptor Requirement */
0x09, // bLength
@@ -81,7 +82,7 @@ const char cfgDescriptor[] = {
0x01, // bNumEndpoints
0x02, // bInterfaceClass
0x02, // bInterfaceSubclass
- 0x00, // bInterfaceProtocol
+ 0x01, // bInterfaceProtocol
0x00, // iInterface
/* Header Functional Descriptor */
@@ -95,7 +96,7 @@ const char cfgDescriptor[] = {
0x04, // bFunctionLength
0x24, // bDescriptor Type: CS_INTERFACE
0x02, // bDescriptor Subtype: ACM Func Desc
- 0x00, // bmCapabilities
+ 0x02, // bmCapabilities
/* Union Functional Descriptor */
0x05, // bFunctionLength
@@ -152,7 +153,7 @@ const char cfgDescriptor[] = {
};
const char strDescriptor[] = {
- 26, // Length
+ 26, // Length
0x03, // Type is string
'p', 0x00,
'r', 0x00,
@@ -168,7 +169,32 @@ const char strDescriptor[] = {
'g', 0x00,
};
+// Bitmap for all status bits in CSR.
+#define REG_NO_EFFECT_1_ALL AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 \
+ |AT91C_UDP_STALLSENT | AT91C_UDP_RXSETUP \
+ |AT91C_UDP_TXCOMP
+
+// Clear flags in the UDP_CSR register and waits for synchronization
+#define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \
+ volatile unsigned int reg; \
+ reg = pUdp->UDP_CSR[(endpoint)]; \
+ reg |= REG_NO_EFFECT_1_ALL; \
+ reg &= ~(flags); \
+ pUdp->UDP_CSR[(endpoint)] = reg; \
+ while ( (pUdp->UDP_CSR[(endpoint)] & (flags)) == (flags)); \
+} \
+
+// reset flags in the UDP_CSR register and waits for synchronization
+#define UDP_SET_EP_FLAGS(endpoint, flags) { \
+ volatile unsigned int reg; \
+ reg = pUdp->UDP_CSR[(endpoint)]; \
+ reg |= REG_NO_EFFECT_1_ALL; \
+ reg |= (flags); \
+ pUdp->UDP_CSR[(endpoint)] = reg; \
+ while ( ( pUdp->UDP_CSR[(endpoint)] & (flags)) != (flags)); \
+} \
+
/* USB standard request code */
#define STD_GET_STATUS_ZERO 0x0080
#define STD_GET_STATUS_INTERFACE 0x0081
@@ -221,13 +247,13 @@ byte_t btReceiveBank = AT91C_UDP_RX_DATA_BK0;
//* \brief This function deactivates the USB device
//*----------------------------------------------------------------------------
void usb_disable() {
- // Disconnect the USB device
- AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
-
- // Clear all lingering interrupts
- if(pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {
- pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
- }
+ // Disconnect the USB device
+ AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;
+
+ // Clear all lingering interrupts
+ if(pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {
+ pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;
+ }
}
//*----------------------------------------------------------------------------
@@ -290,8 +316,8 @@ bool usb_check() {
bool usb_poll()
{
- if (!usb_check()) return false;
- return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
+ if (!usb_check()) return false;
+ return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);
}
/**
@@ -326,9 +352,11 @@ uint32_t usb_read(byte_t* data, size_t len) {
len -= packetSize;
while(packetSize--)
data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];
+
- pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);
-
+ UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank)
+ //pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);
+
if (bank == AT91C_UDP_RX_DATA_BK0)
bank = AT91C_UDP_RX_DATA_BK1;
else
@@ -356,7 +384,9 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
cpt = MIN(length, AT91C_EP_IN_SIZE-1);
length -= cpt;
while (cpt--) pUdp->UDP_FDR[AT91C_EP_IN] = *data++;
- pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;
+
+ UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY)
+ //pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;
while (length) {
// Fill the second bank
@@ -367,20 +397,23 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
if (!usb_check()) return length;
}
- pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);
- while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+ UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP)
+ //pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);
+ //while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
- pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;
+ UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY)
+ //pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;
}
// Wait for the end of transfer
while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {
if (!usb_check()) return length;
}
-
- pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);
- while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
+
+ UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP)
+ //pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);
+ //while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);
return length;
}
@@ -404,17 +437,22 @@ static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t leng
pUdp->UDP_FDR[0] = *pData++;
if (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) {
- pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);
- while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);
+
+ UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_TXCOMP)
+ //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);
+ //while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);
}
- pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;
+ UDP_SET_EP_FLAGS(0, AT91C_UDP_TXPKTRDY)
+ // pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;
do {
csr = pUdp->UDP_CSR[0];
// Data IN stage has been stopped by a status OUT
if (csr & AT91C_UDP_RX_DATA_BK0) {
- pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);
+
+ UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_RX_DATA_BK0)
+ //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);
return;
}
} while ( !(csr & AT91C_UDP_TXCOMP) );
@@ -422,8 +460,10 @@ static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t leng
} while (length);
if (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) {
- pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);
- while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);
+
+ UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_TXCOMP)
+ //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);
+ //while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);
}
}
@@ -432,10 +472,15 @@ static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t leng
//* \brief Send zero length packet through the control endpoint
//*----------------------------------------------------------------------------
void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
- pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;
+
+ UDP_SET_EP_FLAGS(0, AT91C_UDP_TXPKTRDY)
+ //pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;
+
while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) );
- pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);
- while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);
+
+ UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_TXCOMP)
+ //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);
+ //while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);
}
//*----------------------------------------------------------------------------
@@ -445,6 +490,7 @@ void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
pUdp->UDP_CSR[0] |= AT91C_UDP_FORCESTALL;
while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_ISOERROR) );
+
pUdp->UDP_CSR[0] &= ~(AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR);
while (pUdp->UDP_CSR[0] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));
}
@@ -470,11 +516,15 @@ void AT91F_CDC_Enumerate() {
wLength |= (pUdp->UDP_FDR[0] << 8);
if (bmRequestType & 0x80) {
- pUdp->UDP_CSR[0] |= AT91C_UDP_DIR;
- while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_DIR) );
+
+ UDP_SET_EP_FLAGS(0, AT91C_UDP_DIR)
+ //pUdp->UDP_CSR[0] |= AT91C_UDP_DIR;
+ //while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_DIR) );
}
- pUdp->UDP_CSR[0] &= ~AT91C_UDP_RXSETUP;
- while ( (pUdp->UDP_CSR[0] & AT91C_UDP_RXSETUP) );
+
+ UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_RXSETUP)
+ //pUdp->UDP_CSR[0] &= ~AT91C_UDP_RXSETUP;
+ //while ( (pUdp->UDP_CSR[0] & AT91C_UDP_RXSETUP) );
// Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
switch ((bRequest << 8) | bmRequestType) {
@@ -565,7 +615,8 @@ void AT91F_CDC_Enumerate() {
// handle CDC class requests
case SET_LINE_CODING:
while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_RX_DATA_BK0) );
- pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);
+ UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_RX_DATA_BK0)
+ //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);
AT91F_USB_SendZlp(pUdp);
break;
case GET_LINE_CODING: