RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-18 03:00:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: usb communications should be fine again. Inteface size must be 0x08, not 0x40

Browse source
This commit is contained in:
iceman1001 2017-10-12 15:13:18 +02:00
parent fa2aba1532
commit 1d5e3fc217
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/cmd.c
View file

@ -32,6 +32,7 @@
#include "cmd.h" #include "cmd.h"
// (iceman 2017) this method is not used anymore. uart_win32 /uart_posix is used instead
bool cmd_receive(UsbCommand* cmd) { bool cmd_receive(UsbCommand* cmd) {
// Check if there is a usb packet available // Check if there is a usb packet available

10
common/usb_cdc.c
View file

@ -100,7 +100,7 @@ static const char devDescriptor[] = {
/* Device descriptor */ /* Device descriptor */
0x12, // Length 0x12, // Length
0x01, // Descriptor Type (DEVICE) 0x01, // Descriptor Type (DEVICE)
0x00,0x02, // Complies with USB Spec. Release (0200h = release 2.00) 0210 == release 2.10 0x10,0x02, // Complies with USB Spec. Release (0200h = release 2.00) 0210 == release 2.10
0x02, // Device Class: CDC class code 0x02, // Device Class: CDC class code
0x02, // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport :) ] 0x02, // Device Subclass: CDC class sub code ACM [ice 0x02 = win10 virtual comport :) ]
0x00, // Device Protocol: CDC Device protocol 0x00, // Device Protocol: CDC Device protocol
@ -123,7 +123,7 @@ static const char cfgDescriptor[] = {
0x02, // Number of Interfaces 0x02, // Number of Interfaces
0x01, // Index value of this Configuration 0x01, // Index value of this Configuration
0x00, // Configuration string index 0x00, // Configuration string index
_DEFAULT, // Attributes 0xA0 0xC0, // Attributes 0xA0
0xFA, // Max Power consumption 0xFA, // Max Power consumption
/* Communication Class Interface Descriptor Requirement */ /* Communication Class Interface Descriptor Requirement */
@ -160,7 +160,7 @@ static const char cfgDescriptor[] = {
0x05, // Function Length 0x05, // Function Length
0x24, // Descriptor Type: CS_INTERFACE 0x24, // Descriptor Type: CS_INTERFACE
0x01, // Descriptor Subtype: Call Management Func Desc 0x01, // Descriptor Subtype: Call Management Func Desc
0x00, // Capabilities: D1 + D0 (ice 0x03, pm3 0x00, rfidler 0x00) 0x00, // Capabilities: D1 + D0
0x01, // Data Interface: Data Class Interface 1 0x01, // Data Interface: Data Class Interface 1
/* Endpoint descriptor */ /* Endpoint descriptor */
@ -168,8 +168,8 @@ static const char cfgDescriptor[] = {
USB_DESCRIPTOR_ENDPOINT, // Descriptor Type USB_DESCRIPTOR_ENDPOINT, // Descriptor Type
_EP03_IN, // EndpointAddress, Endpoint 03-IN _EP03_IN, // EndpointAddress, Endpoint 03-IN
_INTERRUPT, // Attributes _INTERRUPT, // Attributes
0x40, 0x00, // MaxPacket Size (ice 0x200, pm3 0x08) 0x08, 0x00, // MaxPacket Size (pm3 0x08)
0xFF, // Interval polling (rfidler 0x02, pm3 0xff) 0x02, // Interval polling (rfidler 0x02, pm3 0xff)
/* Data Class Interface Descriptor Requirement */ /* Data Class Interface Descriptor Requirement */
0x09, // Length 0x09, // Length