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

Merge remote-tracking branch 'upstream/master' into hf_mf_sim

Browse source
This commit is contained in:
vratiskol 2019-03-21 20:46:56 +01:00
commit 3b06c9d8ee
13 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/usb_cdc.c
View file

@ -612,7 +612,7 @@ bool usb_poll_validate_length() {
//* \fn usb_read
//* \brief Read available data from Endpoint 1 OUT (host to device)
//*----------------------------------------------------------------------------
uint32_t usb_read(byte_t *data, size_t len) {
uint32_t usb_read(uint8_t *data, size_t len) {
if (len == 0) return 0;
@ -650,7 +650,7 @@ uint32_t usb_read(byte_t *data, size_t len) {
//* \fn usb_write
//* \brief Send through endpoint 2 (device to host)
//*----------------------------------------------------------------------------
uint32_t usb_write(const byte_t *data, const size_t len) {
uint32_t usb_write(const uint8_t *data, const size_t len) {
if (!len) return 0;
if (!usb_check()) return 0;
@ -773,7 +773,7 @@ void AT91F_USB_SendStall(AT91PS_UDP pUdp) {
//* 2. mixed with CDC ACM endpoint3 , interrupt, control endpoint
//*----------------------------------------------------------------------------
void AT91F_CDC_Enumerate() {
byte_t bmRequestType, bRequest;
uint8_t bmRequestType, bRequest;
uint16_t wValue, wIndex, wLength, wStatus;
if (!(pUdp->UDP_CSR[AT91C_EP_CONTROL] & AT91C_UDP_RXSETUP))

4
common/usb_cdc.h
View file

@ -46,8 +46,8 @@ extern void usb_enable();
extern bool usb_check();
extern bool usb_poll();
extern bool usb_poll_validate_length();
extern uint32_t usb_read(byte_t *data, size_t len);
extern uint32_t usb_write(const byte_t *data, const size_t len);
extern uint32_t usb_read(uint8_t *data, size_t len);
extern uint32_t usb_write(const uint8_t *data, const size_t len);
extern void SetUSBreconnect(int value);
extern int GetUSBreconnect(void);