projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't compile in ISP sources into the XPLAIN bridge project.
[pub/USBasp.git]
/
Projects
/
XPLAINBridge
/
USARTDescriptors.c
diff --git
a/Projects/XPLAINBridge/USARTDescriptors.c
b/Projects/XPLAINBridge/USARTDescriptors.c
index
4bbb2c4
..
54f0d96
100644
(file)
--- a/
Projects/XPLAINBridge/USARTDescriptors.c
+++ b/
Projects/XPLAINBridge/USARTDescriptors.c
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
6
.
+ Copyright (C) Dean Camera, 201
7
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
6
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
7
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
@@
-198,8
+198,7
@@
const USB_Descriptor_String_t PROGMEM USART_ProductString = USB_STRING_DESCRIPTO
*/
uint16_t USART_GetDescriptor(const uint16_t wValue,
const uint16_t wIndex,
*/
uint16_t USART_GetDescriptor(const uint16_t wValue,
const uint16_t wIndex,
- const void** const DescriptorAddress,
- uint8_t* const DescriptorMemorySpace)
+ const void** const DescriptorAddress)
{
const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF);
{
const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF);
@@
-207,8
+206,6
@@
uint16_t USART_GetDescriptor(const uint16_t wValue,
const void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR;
const void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR;
- *DescriptorMemorySpace = MEMSPACE_FLASH;
-
switch (DescriptorType)
{
case DTYPE_Device:
switch (DescriptorType)
{
case DTYPE_Device: