Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to obfuscate code.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@553 d5102386-fcda-11dd-9fdb-3debd5008f28

1 files changed, 7 insertions, 7 deletions

diff --git a/Demos/Device/Mouse/Descriptors.c b/Demos/Device/Mouse/Descriptors.c
index 1a2b22ab..0a6cbde3 100644
--- a/Demos/Device/Mouse/Descriptors.c
+++ b/Demos/Device/Mouse/Descriptors.c
@@ -210,37 +210,37 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
 	switch (DescriptorType)

 	{

 		case DTYPE_Device:

-			Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);

+			Address = (void*)&DeviceDescriptor;

 			Size    = sizeof(USB_Descriptor_Device_t);

 			break;

 		case DTYPE_Configuration:

-			Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);

+			Address = (void*)&ConfigurationDescriptor;

 			Size    = sizeof(USB_Descriptor_Configuration_t);

 			break;

 		case DTYPE_String:

 			switch (DescriptorNumber)

 			{

 				case 0x00:

-					Address = DESCRIPTOR_ADDRESS(LanguageString);

+					Address = (void*)&LanguageString;

 					Size    = pgm_read_byte(&LanguageString.Header.Size);

 					break;

 				case 0x01:

-					Address = DESCRIPTOR_ADDRESS(ManufacturerString);

+					Address = (void*)&ManufacturerString;

 					Size    = pgm_read_byte(&ManufacturerString.Header.Size);

 					break;

 				case 0x02:

-					Address = DESCRIPTOR_ADDRESS(ProductString);

+					Address = (void*)&ProductString;

 					Size    = pgm_read_byte(&ProductString.Header.Size);

 					break;

 			}

 			

 			break;

 		case DTYPE_HID: 

-			Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.MouseHID);

+			Address = (void*)&ConfigurationDescriptor.MouseHID;

 			Size    = sizeof(USB_Descriptor_HID_t);

 			break;

 		case DTYPE_Report: 

-			Address = DESCRIPTOR_ADDRESS(MouseReport);

+			Address = (void*)&MouseReport;

 			Size    = sizeof(MouseReport);

 			break;

 	}