Commit b4d313d

committed

add numInterfaces field to PUSBCallbacks

1 parent b8d29ba commit b4d313dCopy full SHA for b4d313d

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,13 +94,13 @@ int8_t PUSB_AddFunction(PUSBCallbacks cb, u8 interface)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`*interface = lastIf;`
`97`		`- lastIf++;`
	`97`	`+ lastIf += cb->numInterfaces;`
`98`	`98`	`for ( u8 i = 0; i< cb->numEndpoints; i++) {`
`99`	`99`	`_initEndpoints[lastEp] = cb->endpointType[i];`
`100`	`100`	`lastEp++;`
`101`	`101`	`}`
`102`	`102`	`modules_count++;`
`103`		`- return lastEp-1;`
	`103`	`+ return lastEp - cb->numEndpoints;`
`104`	`104`	`// restart USB layer???`
`105`	`105`	`}`
`106`	`106`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ typedef struct`
`31`	`31`	`int8_t (getInterface)(u8 interfaceNum);`
`32`	`32`	`int8_t (*getDescriptor)(int8_t t);`
`33`	`33`	`int8_t numEndpoints;`
	`34`	`+ int8_t numInterfaces;`
`34`	`35`	`u8 endpointType[];`
`35`	`36`	`} PUSBCallbacks;`
`36`	`37`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ extern const u16 STRING_LANGUAGE[] PROGMEM;`
`33`	`33`	`extern const u8 STRING_PRODUCT[] PROGMEM;`
`34`	`34`	`extern const u8 STRING_MANUFACTURER[] PROGMEM;`
`35`	`35`	`extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;`
`36`		`-extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;`
`37`	`36`	`extern const DeviceDescriptor USB_DeviceDescriptorB PROGMEM;`
`38`	`37`
`39`	`38`	`const u16 STRING_LANGUAGE[2] = {`
`@@ -72,9 +71,6 @@ const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER;`
`72`	`71`	`const DeviceDescriptor USB_DeviceDescriptor =`
`73`	`72`	`D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);`
`74`	`73`
`75`		`-const DeviceDescriptor USB_DeviceDescriptorA =`
`76`		`- D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);`
`77`		`-`
`78`	`74`	`const DeviceDescriptor USB_DeviceDescriptorB =`
`79`	`75`	`D_DEVICE(0xEF,0x02,0x01,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);`
`80`	`76`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ int8_t HID_Plug(void)`
`120`	`120`	`cb.getInterface = &HID_GetInterface;`
`121`	`121`	`cb.getDescriptor = &HID_GetDescriptor;`
`122`	`122`	`cb.numEndpoints = 1;`
	`123`	`+ cb.numInterfaces = 1;`
`123`	`124`	`cb.endpointType[0] = EP_TYPE_INTERRUPT_IN;`
`124`	`125`	`HID_ENDPOINT_INT = PUSB_AddFunction(&cb, &HID_INTERFACE);`
`125`	`126`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ int8_t MIDI_plug(void)`
`179`	`179`	`cb.getInterface = &MIDI_GetInterface;`
`180`	`180`	`cb.getDescriptor = &MIDI_GetDescriptor;`
`181`	`181`	`cb.numEndpoints = 2;`
	`182`	`+ cb.numInterfaces = 2;`
`182`	`183`	`cb.endpointType[0] = EP_TYPE_BULK_OUT_MIDI; // MIDI_ENDPOINT_OUT`
`183`	`184`	`cb.endpointType[1] = EP_TYPE_BULK_IN_MIDI; // MIDI_ENDPOINT_IN`
`184`	`185`

Comments

(0)