diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-10 19:24:58 +0000 | 
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-10 19:24:58 +0000 | 
| commit | 359fbfe14d00ab378f85a36664820ea9ba538c3f (patch) | |
| tree | 0929d5663a3be4dc078dda0aba5ba798ebb627ab /Projects/Webserver/USBDeviceMode.c | |
| parent | e8570c4a37e41117e3fd1e989e0b41f1e9608f3c (diff) | |
| download | lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.tar.gz lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.tar.bz2 lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.zip | |
Add branch for the conversion of demos to use standard C header files for configuration, rather than makefile defined macros.
Diffstat (limited to 'Projects/Webserver/USBDeviceMode.c')
| -rw-r--r-- | Projects/Webserver/USBDeviceMode.c | 54 | 
1 files changed, 31 insertions, 23 deletions
| diff --git a/Projects/Webserver/USBDeviceMode.c b/Projects/Webserver/USBDeviceMode.c index 591ee92b0..158e7590f 100644 --- a/Projects/Webserver/USBDeviceMode.c +++ b/Projects/Webserver/USBDeviceMode.c @@ -45,19 +45,24 @@ USB_ClassInfo_RNDIS_Device_t Ethernet_RNDIS_Interface_Device =  		.Config =  			{  				.ControlInterfaceNumber         = 0, - -				.DataINEndpointNumber           = CDC_TX_EPNUM, -				.DataINEndpointSize             = CDC_TXRX_EPSIZE, -				.DataINEndpointDoubleBank       = true, - -				.DataOUTEndpointNumber          = CDC_RX_EPNUM, -				.DataOUTEndpointSize            = CDC_TXRX_EPSIZE, -				.DataOUTEndpointDoubleBank      = true, - -				.NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM, -				.NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE, -				.NotificationEndpointDoubleBank = true, - +				.DataINEndpoint                 = +					{ +						.Address                = CDC_TX_EPADDR, +						.Size                   = CDC_TXRX_EPSIZE, +						.Banks                  = 1, +					}, +				.DataOUTEndpoint                = +					{ +						.Address                = CDC_RX_EPADDR, +						.Size                   = CDC_TXRX_EPSIZE, +						.Banks                  = 1, +					}, +				.NotificationEndpoint           = +					{ +						.Address                = CDC_NOTIFICATION_EPADDR, +						.Size                   = CDC_NOTIFICATION_EPSIZE, +						.Banks                  = 1, +					},  				.AdapterVendorDescription       = "LUFA RNDIS Adapter",  				.AdapterMACAddress              = {{0x02, 0x00, 0x02, 0x00, 0x02, 0x00}},  			}, @@ -71,16 +76,19 @@ USB_ClassInfo_MS_Device_t Disk_MS_Interface =  	{  		.Config =  			{ -				.InterfaceNumber           = 2, - -				.DataINEndpointNumber      = MASS_STORAGE_IN_EPNUM, -				.DataINEndpointSize        = MASS_STORAGE_IO_EPSIZE, -				.DataINEndpointDoubleBank  = false, - -				.DataOUTEndpointNumber     = MASS_STORAGE_OUT_EPNUM, -				.DataOUTEndpointSize       = MASS_STORAGE_IO_EPSIZE, -				.DataOUTEndpointDoubleBank = false, - +				.InterfaceNumber                = 2, +				.DataINEndpoint                 = +					{ +						.Address                = MASS_STORAGE_IN_EPADDR, +						.Size                   = MASS_STORAGE_IO_EPSIZE, +						.Banks                  = 1, +					}, +				.DataOUTEndpoint                = +					{ +						.Address                = MASS_STORAGE_OUT_EPADDR, +						.Size                   = MASS_STORAGE_IO_EPSIZE, +						.Banks                  = 1, +					},  				.TotalLUNs                 = 1,  			},  	}; | 
