projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix additional void pointer arithmetic in the class driver RNDIS demo.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Core
/
DeviceStandardReq.c
diff --git
a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index
1106f7b
..
8315815
100644
(file)
--- a/
LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/
LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
3
.
+ Copyright (C) Dean Camera, 201
5
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
3
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
5
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-117,8
+117,8
@@
void USB_Device_ProcessControlRequest(void)
if (Endpoint_IsSETUPReceived())
{
if (Endpoint_IsSETUPReceived())
{
- Endpoint_StallTransaction();
Endpoint_ClearSETUP();
Endpoint_ClearSETUP();
+ Endpoint_StallTransaction();
}
}
}
}
@@
-134,7
+134,7
@@
static void USB_Device_SetAddress(void)
while (!(Endpoint_IsINReady()));
while (!(Endpoint_IsINReady()));
- USB_Device_EnableDeviceAddress();
+ USB_Device_EnableDeviceAddress(
DeviceAddress
);
USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
}
USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
}
@@
-152,8
+152,8
@@
static void USB_Device_SetConfiguration(void)
#define MemoryAddressSpace MEMSPACE_FLASH
#elif defined(USE_EEPROM_DESCRIPTORS)
#define MemoryAddressSpace MEMSPACE_EEPROM
#define MemoryAddressSpace MEMSPACE_FLASH
#elif defined(USE_EEPROM_DESCRIPTORS)
#define MemoryAddressSpace MEMSPACE_EEPROM
- #elif defined(USE_
S
RAM_DESCRIPTORS)
- #define MemoryAddressSpace MEMSPACE_
S
RAM
+ #elif defined(USE_RAM_DESCRIPTORS)
+ #define MemoryAddressSpace MEMSPACE_RAM
#else
uint8_t MemoryAddressSpace;
#endif
#else
uint8_t MemoryAddressSpace;
#endif