From ab09322b7acfa1667f3124612735ea83ce5342d5 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Sat, 18 Apr 2009 20:04:52 +0000 Subject: Add a PACK_DESCRIPTOR macro to make the class drivers a bit more readable (FS#10145 by Tomer Shalev) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20733 a1c6a512-1295-4272-9138-f99709370657 --- firmware/usbstack/usb_serial.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'firmware/usbstack/usb_serial.c') diff --git a/firmware/usbstack/usb_serial.c b/firmware/usbstack/usb_serial.c index b7d5062237..514df0dc2b 100644 --- a/firmware/usbstack/usb_serial.c +++ b/firmware/usbstack/usb_serial.c @@ -24,7 +24,7 @@ #include "usb_drv.h" #include "kernel.h" #include "usb_serial.h" - +#include "usb_class_driver.h" //#define LOGF_ENABLE #include "logf.h" @@ -102,19 +102,16 @@ int usb_serial_get_config_descriptor(unsigned char *dest,int max_packet_size) { unsigned char *orig_dest = dest; - endpoint_descriptor.wMaxPacketSize=max_packet_size; - interface_descriptor.bInterfaceNumber=usb_interface; + interface_descriptor.bInterfaceNumber = usb_interface; + PACK_DESCRIPTOR(dest, interface_descriptor); - memcpy(dest,&interface_descriptor,sizeof(struct usb_interface_descriptor)); - dest+=sizeof(struct usb_interface_descriptor); + endpoint_descriptor.wMaxPacketSize = max_packet_size; endpoint_descriptor.bEndpointAddress = ep_in; - memcpy(dest,&endpoint_descriptor,sizeof(struct usb_endpoint_descriptor)); - dest+=sizeof(struct usb_endpoint_descriptor); + PACK_DESCRIPTOR(dest, endpoint_descriptor); endpoint_descriptor.bEndpointAddress = ep_out; - memcpy(dest,&endpoint_descriptor,sizeof(struct usb_endpoint_descriptor)); - dest+=sizeof(struct usb_endpoint_descriptor); + PACK_DESCRIPTOR(dest, endpoint_descriptor); return (dest - orig_dest); } -- cgit