diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-07-30 19:04:55 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-07-30 19:04:55 +0200 |
| commit | a3de0a4ac29118c3ada946a0c8f7f602c9066ec1 (patch) | |
| tree | 8408d463a3ea6910d7336e24d60611da8a50b77d /firmware/src/os | |
| parent | dd88fde8d2b78243c01871cabca37c9e46ebd03d (diff) | |
| parent | ffbce3ea2cda51214be0bb7a107954f890f99b0d (diff) | |
Merge branch 'simtrace'
Diffstat (limited to 'firmware/src/os')
| -rw-r--r-- | firmware/src/os/dbgu.c | 2 | ||||
| -rw-r--r-- | firmware/src/os/req_ctx.c | 6 | ||||
| -rw-r--r-- | firmware/src/os/req_ctx.h | 2 | ||||
| -rw-r--r-- | firmware/src/os/usb_descriptors_openpcd.h | 14 |
4 files changed, 12 insertions, 12 deletions
diff --git a/firmware/src/os/dbgu.c b/firmware/src/os/dbgu.c index 026b56b..28d86a4 100644 --- a/firmware/src/os/dbgu.c +++ b/firmware/src/os/dbgu.c @@ -147,7 +147,7 @@ void AT91F_DBGU_Init(void) sysirq_register(AT91SAM7_SYSIRQ_DBGU, &DBGU_irq_handler); AT91F_DBGU_Printk("\n\r"); - AT91F_DBGU_Printk("(C) 2006 by Harald Welte <hwelte@hmw-consulting.de>\n\r" + AT91F_DBGU_Printk("(C) 2006-2011 by Harald Welte <hwelte@hmw-consulting.de>\n\r" "This software is FREE SOFTWARE licensed under GNU GPL\n\r"); AT91F_DBGU_Printk("Version " COMPILE_SVNREV " compiled " COMPILE_DATE diff --git a/firmware/src/os/req_ctx.c b/firmware/src/os/req_ctx.c index 73b6035..cc8d57b 100644 --- a/firmware/src/os/req_ctx.c +++ b/firmware/src/os/req_ctx.c @@ -28,9 +28,9 @@ /* FIXME: locking, FIFO order processing */ -#ifdef __AT91SAM7S64__ -#define NUM_RCTX_SMALL 4 -#define NUM_RCTX_LARGE 2 +#if defined(__AT91SAM7S64__) || defined(RUN_FROM_RAM) +#define NUM_RCTX_SMALL 16 +#define NUM_RCTX_LARGE 1 #else #define NUM_RCTX_SMALL 8 #define NUM_RCTX_LARGE 4 diff --git a/firmware/src/os/req_ctx.h b/firmware/src/os/req_ctx.h index ac9ab3f..94b5c5a 100644 --- a/firmware/src/os/req_ctx.h +++ b/firmware/src/os/req_ctx.h @@ -2,7 +2,7 @@ #define _REQ_CTX_H #define RCTX_SIZE_LARGE 2048 -#define RCTX_SIZE_SMALL 64 +#define RCTX_SIZE_SMALL 128 #define MAX_HDRSIZE sizeof(struct openpcd_hdr) #define MAX_REQSIZE (64-MAX_HDRSIZE) diff --git a/firmware/src/os/usb_descriptors_openpcd.h b/firmware/src/os/usb_descriptors_openpcd.h index ceb7ff6..58c54ec 100644 --- a/firmware/src/os/usb_descriptors_openpcd.h +++ b/firmware/src/os/usb_descriptors_openpcd.h @@ -20,8 +20,8 @@ const struct usb_device_descriptor dev_descriptor = { .idProduct = USB_PRODUCT_ID, .bcdDevice = 0x0030, /* Version 0.3 */ #ifdef CONFIG_USB_STRING - .iManufacturer = 3, - .iProduct = 4, + .iManufacturer = 4, + .iProduct = 5, .iSerialNumber = 0, #else .iManufacturer = 0, @@ -36,7 +36,7 @@ struct _desc { struct usb_interface_descriptor uif; struct usb_endpoint_descriptor ep[3]; #ifdef CONFIG_DFU - struct usb_interface_descriptor uif_dfu[2]; + struct usb_interface_descriptor uif_dfu[3]; #endif }; @@ -46,9 +46,9 @@ const struct _desc cfg_descriptor = { .bDescriptorType = USB_DT_CONFIG, .wTotalLength = USB_DT_CONFIG_SIZE + #ifdef CONFIG_DFU - 3 * USB_DT_INTERFACE_SIZE + + 4 * USB_DT_INTERFACE_SIZE + 3 * USB_DT_ENDPOINT_SIZE, - .bNumInterfaces = 3, + .bNumInterfaces = 4, #else 1 * USB_DT_INTERFACE_SIZE + 3 * USB_DT_ENDPOINT_SIZE, @@ -56,7 +56,7 @@ const struct _desc cfg_descriptor = { #endif .bConfigurationValue = 1, #ifdef CONFIG_USB_STRING - .iConfiguration = 5, + .iConfiguration = 6, #else .iConfiguration = 0, #endif @@ -73,7 +73,7 @@ const struct _desc cfg_descriptor = { .bInterfaceSubClass = 0, .bInterfaceProtocol = 0xff, #ifdef CONFIG_USB_STRING - .iInterface = 6, + .iInterface = 7, #else .iInterface = 0, #endif |