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

CHG: pm3 device will be identified on win10 automatic without drivers. Sadly no com port...

Browse source
This commit is contained in:
iceman1001 2017-10-11 12:46:38 +02:00
commit 480c0d0ba0
2 changed files with 59 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/usb_cdc.c
View file

@ -169,7 +169,7 @@ static const char cfgDescriptor[] = {
_EP03_IN, // EndpointAddress, Endpoint 03-IN _EP03_IN, // EndpointAddress, Endpoint 03-IN
_INTERRUPT, // Attributes _INTERRUPT, // Attributes
0x40, 0x00, // MaxPacket Size (ice 0x200, pm3 0x08) 0x40, 0x00, // MaxPacket Size (ice 0x200, pm3 0x08)
0x02, // Interval polling (rfidler 0x02, pm3 0xff) 0xFF, // Interval polling (rfidler 0x02, pm3 0xff)
/* Data Class Interface Descriptor Requirement */ /* Data Class Interface Descriptor Requirement */
0x09, // Length 0x09, // Length
@ -188,7 +188,7 @@ static const char cfgDescriptor[] = {
_EP01_OUT, // Endpoint Address, Endpoint 01-OUT _EP01_OUT, // Endpoint Address, Endpoint 01-OUT
_BULK, // Attributes BULK _BULK, // Attributes BULK
0x40, 0x00, // MaxPacket Size 0x40, 0x00, // MaxPacket Size
0x00, // Interval 0x00, // Interval (ignored for bulk)
/* Endpoint descriptor */ /* Endpoint descriptor */
0x07, // Length 0x07, // Length
@ -196,7 +196,7 @@ static const char cfgDescriptor[] = {
_EP02_IN, // Endpoint Address, Endpoint 02-IN _EP02_IN, // Endpoint Address, Endpoint 02-IN
_BULK, // Attributes BULK _BULK, // Attributes BULK
0x40, 0x00, // MaxPacket Size 0x40, 0x00, // MaxPacket Size
0x00 // Interval 0x00 // Interval (ignored for bulk)
}; };
// Microsoft OS Extended Configuration Compatible ID Descriptor // Microsoft OS Extended Configuration Compatible ID Descriptor
@ -744,24 +744,19 @@ void AT91F_CDC_Enumerate() {
if ( bRequest == MS_VENDOR_CODE) { if ( bRequest == MS_VENDOR_CODE) {
if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0 if ( bmRequestType == MS_WCID_GET_DESCRIPTOR ) { // C0
if ( wIndex == MS_EXTENDED_COMPAT_ID ) { // 4 if ( wIndex == MS_EXTENDED_COMPAT_ID ) { // 4
AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength)); AT91F_USB_SendData(pUdp, CompatIDFeatureDescriptor, MIN(sizeof(CompatIDFeatureDescriptor), wLength));
} else {
AT91F_USB_SendStall(pUdp);
}
return; return;
} }
}
if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) { //C1 if ( bmRequestType == MS_WCID_GET_FEATURE_DESCRIPTOR ) { //C1
if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5 if ( wIndex == MS_EXTENDED_PROPERTIES ) { // 5
AT91F_USB_SendData(pUdp, (char *)&OSPropertyDescriptor, MIN(sizeof(OSPropertyDescriptor), wLength)); AT91F_USB_SendData(pUdp, (char *)&OSPropertyDescriptor, MIN(sizeof(OSPropertyDescriptor), wLength));
AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength)); //AT91F_USB_SendData(pUdp, OSprop, MIN(sizeof(OSprop), wLength));
} else {
AT91F_USB_SendStall(pUdp);
}
return; return;
} }
} }
}
// Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1 // Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1
switch ((bRequest << 8) | bmRequestType) { switch ((bRequest << 8) | bmRequestType) {
case STD_GET_DESCRIPTOR: case STD_GET_DESCRIPTOR:

13
uart/uart_win32.c
View file

@ -111,18 +111,18 @@ serial_port uart_open(const char* pcPortName) {
} }
void uart_close(const serial_port sp) { void uart_close(const serial_port sp) {
if (!sp) return; // if (!sp) return;
if (sp == INVALID_SERIAL_PORT) return; // if (sp == INVALID_SERIAL_PORT) return;
if (sp == CLAIMED_SERIAL_PORT) return; // if (sp == CLAIMED_SERIAL_PORT) return;
if (((serial_port_windows*)sp)->hPort != INVALID_HANDLE_VALUE ) if (((serial_port_windows*)sp)->hPort != INVALID_HANDLE_VALUE )
CloseHandle(((serial_port_windows*)sp)->hPort); CloseHandle(((serial_port_windows*)sp)->hPort);
free(sp); free(sp);
} }
bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) { bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_t* pszRxLen) {
//ReadFile(((serial_port_windows*)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL); ReadFile(((serial_port_windows*)sp)->hPort, pbtRx, pszMaxRxLen, (LPDWORD)pszRxLen, NULL);
//return (*pszRxLen != 0); return (*pszRxLen != 0);
/*
DWORD dwBytesToGet = (DWORD)pszMaxRxLen; DWORD dwBytesToGet = (DWORD)pszMaxRxLen;
DWORD dwBytesReceived = 0; DWORD dwBytesReceived = 0;
DWORD dwTotalBytesReceived = 0; DWORD dwTotalBytesReceived = 0;
@ -144,6 +144,7 @@ bool uart_receive(const serial_port sp, byte_t* pbtRx, size_t pszMaxRxLen, size_
} while (((DWORD)pszMaxRxLen) > dwTotalBytesReceived); } while (((DWORD)pszMaxRxLen) > dwTotalBytesReceived);
return (dwTotalBytesReceived == (DWORD) pszMaxRxLen); return (dwTotalBytesReceived == (DWORD) pszMaxRxLen);
*/
} }
bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen) { bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen) {