avr: usb.c comparison

comparison usb.c @ 26:350e8655cbb7

- Remove some #if'd out code. - Use STRING_DESCRIPTOR types instead of rolling one for each type of string. - Fix comment typo.

author	darius
date	Tue, 13 Dec 2005 10:53:48 +1030
parents	845934a4e7fe
children	4e417d84365e

comparison

equal deleted inserted replaced

-:a52bc6b9e305
+:350e8655cbb7
 	sizeof(LANGID_DESCRIPTOR),		/* bLength - must match string below */
 	TYPE_STRING_DESCRIPTOR,			/* bDescriptorType */
 	0x0409					/* LANGID US English */
 };
-/* These are really STRING_DESCRIPTOR's but we can't statically
+STRING_DESCRIPTOR Manufacturer_Descriptor = {
-* declare them as that and have the compiler generate the right size
+sizeof(STRING_DESCRIPTOR) + 32,			/* bLength */
-* structure */
+TYPE_STRING_DESCRIPTOR,				/* bDescriptorType */
-typedef struct {
+"G\0e\0n\0e\0s\0i\0s\0 \0S\0o\0f\0t\0w\0a\0r\0e\0" 	/* ManufacturerString in
-	uint8_t bLenght;
+							 * UNICODE */
-	uint8_t bDescriptorType;
-	char     bString[32];
-} MANUFACTURER_DESCRIPTOR, *PMANUFACTURER_DESCRIPTOR;
-const MANUFACTURER_DESCRIPTOR Manufacturer_Descriptor = {	/* ManufacturerString 1 */
-sizeof(MANUFACTURER_DESCRIPTOR),				/* bLength */
-TYPE_STRING_DESCRIPTOR,					/* bDescriptorType */
-"G\0e\0n\0e\0s\0i\0s\0 \0S\0o\0f\0t\0w\0a\0r\0e\0" 		/* ManufacturerString in
-								 * UNICODE */
 };
-typedef struct {
+STRING_DESCRIPTOR Product_Descriptor = {
-	uint8_t bLenght;
+sizeof(STRING_DESCRIPTOR) + 48,		/* bLength */
-	uint8_t bDescriptorType;
-	char     bString[48];
-} PRODUCT_DESCRIPTOR, *PPRODUCT_DESCRIPTOR;
-const PRODUCT_DESCRIPTOR Product_Descriptor = {	/* ProductString 2 */
-sizeof(PRODUCT_DESCRIPTOR),			/* bLength */
 TYPE_STRING_DESCRIPTOR,			/* bDescriptorType */
 /* ProductString in
 * UNICODE */
 "R\0S\0""-\0""4\0""8\0""5\0"" \0M\0u\0l\0t\0i\0d\0r\0o\0p\0 \0A\0d\0a\0p\0t\0e\0r\0"
 /* XXX: dunno why I need the double quote magic above.. */
 };
-typedef struct {
+STRING_DESCRIPTOR Serial_Descriptor;
-	uint8_t bLenght;
+STRING_DESCRIPTOR EE_Serial_Descriptor  __attribute__ ((section (".eeprom"))) = { /* SerialString 3 */
-	uint8_t bDescriptorType;
+sizeof(STRING_DESCRIPTOR) + 20,	/* bLength - must match string below */
-	char     bString[20];
-} SERIAL_DESCRIPTOR, *PSERIAL_DESCRIPTOR;
-const SERIAL_DESCRIPTOR EE_Serial_Descriptor __attribute__ ((section (".eeprom"))) = { /* SerialString 3 */
-sizeof(SERIAL_DESCRIPTOR),		/* bLength - must match string below */
 TYPE_STRING_DESCRIPTOR,		/* bDescriptorType */
 "1\02\03\0"
 };
-SERIAL_DESCRIPTOR Serial_Descriptor;
 /*
 * The PDIUSBD12 is wired up like so
 *
 *  PDI		     AVR
 * SUSPEND  <=>     PB4
 */
 uint8_t
 d12_get_data(void) {
 uint8_t data;
-#if 0
-_delay_us(1);
-#endif
 PORTB &= ~_BV(PB3);	/* Data phase */
 DDRA = 0x00;	/* Set to input */
 PORTB &= ~_BV(PB1);	/* Pull RD_N low */
 PORTB &= ~_BV(PB1);	/* Delay 40ns */
 PORTB &= ~_BV(PB1);
 return(data);
 }
 void
 set_d12_data(uint8_t data) {
-#if 0
-_delay_us(1);
-#endif
 PORTB &= ~_BV(PB3);	/* Data phase */
 DDRA = 0xff;	/* Set to output */
 PORTA = data;	/* Put the data on the bus */
 PORTB &= ~_BV(PB2);	/* Pull WR_N low */
 PORTB &= ~_BV(PB2);	/* Delay 40ns */
 DDRA = 0x00;	/* Back to input */
 }
 void
 set_d12_cmd(uint8_t cmd) {
-#if 0
-_delay_us(1);
-#endif
 PORTB |= _BV(PB3);	/* Command phase */
 DDRA = 0xff;	/* Set to output */
 PORTA = cmd;	/* Put the data on the bus */
 PORTB &= ~_BV(PB2);	/* Pull WR_N low */
 PORTB &= ~_BV(PB2);	/* Delay 40ns */
 void
 d12_write_cmd(uint8_t command, const uint8_t *buffer, uint8_t count) {
 uint8_t i;
 set_d12_cmd(command);
-#if 0
-_delay_us(1);
-#endif
 if (count) {
 	for (i = 0; i < count; i++) {
 	    set_d12_data(buffer[i]);
 	}
 }
 void
 usb_init(void) {
 uint8_t	buffer[2];
 /* pull EE_Serial_Descriptor into RAM */
-eeprom_read_block(&Serial_Descriptor, &EE_Serial_Descriptor, sizeof(Serial_Descriptor));
+eeprom_read_block(&Serial_Descriptor, &EE_Serial_Descriptor, EE_Serial_Descriptor.bLength);
 /* Set Address to zero (default) and enable function */
 buffer[0] = 0x80;
 d12_write_cmd(D12_SET_ADDRESS_ENABLE, buffer, 1);
 	/* This is a Data Packet */
 }
 }
-/* Reset the micro
+/* Reset the micro */
 static void
 reset(void) {
 MCUCR = _BV(IVCE);
 MCUCR = 0;
 WDTCR = _BV(WDE);
 	case TYPE_STRING_DESCRIPTOR:
 	    switch (setuppkt->wValue & 0xFF) {
 		case 0:
 		    pSendBuffer = (const uint8_t *)&LANGID_Descriptor;
-		    BytesToSend = sizeof(LANGID_Descriptor);
+		    BytesToSend = LANGID_Descriptor.bLength;
 		    break;
 		case 1:
 		    pSendBuffer = (const uint8_t *)&Manufacturer_Descriptor;
-		    BytesToSend = sizeof(Manufacturer_Descriptor);
+		    BytesToSend = Manufacturer_Descriptor.bLength;
 		    break;
 		case 2:
 		    pSendBuffer = (const uint8_t *)&Product_Descriptor;
-		    BytesToSend = sizeof(Product_Descriptor);
+		    BytesToSend = Product_Descriptor.bLength;
 		    break;
 		case 3:
 		    pSendBuffer = (const uint8_t *)&Serial_Descriptor;
-		    BytesToSend = sizeof(Serial_Descriptor);
+		    BytesToSend = Serial_Descriptor.bLength;
 		    break;
 		default:
 		    pSendBuffer = NULL;
 		    BytesToSend = 0;
 if (BytesToSend == 0) {
 	/*
 	 * If BytesToSend is Zero and we get called again, assume
 	 * buffer is smaller
 	 * than Setup Request Size and indicate end by sending Zero
-	 * Lenght packet
+	 * Length packet
 	 */
 	d12_write_endpt(D12_ENDPOINT_EP0_IN, NULL, 0);
 	send_Bytes = 0;
 } else if (BytesToSend >= EP0_SIZE) {
 	/* Write another EP0_SIZE Bytes to buffer and send */

Mercurial > ~darius > hgwebdir.cgi > avr

comparison usb.c @ 26:350e8655cbb7