catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-27 10:48:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

redifined phone usb interface

Browse Source
This commit is contained in:
Christina Quast
2015-04-03 11:35:59 +02:00
parent 254acae448
commit 7123425841
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sam3s_example/simtrace/simtrace.h
View File

@@ -6,7 +6,16 @@
#define DATAIN 2 #define DATAIN 2
#define INT 3 #define INT 3
#define BUFLEN 5 #define BUFLEN 5
//#define PHONE_DATAOUT 4
//#define PHONE_DATAIN 5
//#define PHONE_INT 6
#define PHONE_DATAOUT 1
#define PHONE_DATAIN 2
#define PHONE_INT 3
typedef struct ring_buffer typedef struct ring_buffer
{ {
uint8_t buf[BUFLEN*2]; // data buffer uint8_t buf[BUFLEN*2]; // data buffer

27
sam3s_example/simtrace/usb.c
View File

@@ -376,9 +376,9 @@ const SIMTraceDriverConfigurationDescriptorPhone configurationDescriptorPhone =
sizeof(USBEndpointDescriptor), sizeof(USBEndpointDescriptor),
USBGenericDescriptor_ENDPOINT, USBGenericDescriptor_ENDPOINT,
USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_OUT, USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_OUT,
DATAOUT), PHONE_DATAOUT),
USBEndpointDescriptor_BULK, USBEndpointDescriptor_BULK,
MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(DATAOUT), MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAOUT),
USBEndpointDescriptor_MAXBULKSIZE_FS), USBEndpointDescriptor_MAXBULKSIZE_FS),
0 /* Must be 0 for full-speed bulk endpoints */ 0 /* Must be 0 for full-speed bulk endpoints */
}, },
@@ -387,9 +387,9 @@ const SIMTraceDriverConfigurationDescriptorPhone configurationDescriptorPhone =
sizeof(USBEndpointDescriptor), sizeof(USBEndpointDescriptor),
USBGenericDescriptor_ENDPOINT, USBGenericDescriptor_ENDPOINT,
USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN, USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN,
DATAIN), PHONE_DATAIN),
USBEndpointDescriptor_BULK, USBEndpointDescriptor_BULK,
MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(DATAIN), MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAIN),
USBEndpointDescriptor_MAXBULKSIZE_FS), USBEndpointDescriptor_MAXBULKSIZE_FS),
0 /* Must be 0 for full-speed bulk endpoints */ 0 /* Must be 0 for full-speed bulk endpoints */
}, },
@@ -397,9 +397,9 @@ const SIMTraceDriverConfigurationDescriptorPhone configurationDescriptorPhone =
{ {
sizeof(USBEndpointDescriptor), sizeof(USBEndpointDescriptor),
USBGenericDescriptor_ENDPOINT, USBGenericDescriptor_ENDPOINT,
USBEndpointDescriptor_ADDRESS( USBEndpointDescriptor_IN, INT ), USBEndpointDescriptor_ADDRESS( USBEndpointDescriptor_IN, PHONE_INT ),
USBEndpointDescriptor_INTERRUPT, USBEndpointDescriptor_INTERRUPT,
MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(INT), MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_INT),
USBEndpointDescriptor_MAXINTERRUPTSIZE_FS), USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
0x10 0x10
} }
@@ -492,17 +492,14 @@ const SIMTraceDriverConfigurationDescriptorMITM configurationDescriptorMITM = {
0, 0,
0, /* FIXME: string descriptor for this interface */ 0, /* FIXME: string descriptor for this interface */
}, },
#define DATAOUT_2 DATAOUT+3
#define DATAIN_2 DATAIN+3
#define INT_2 INT+3
/* Bulk-OUT endpoint standard descriptor */ /* Bulk-OUT endpoint standard descriptor */
{ {
sizeof(USBEndpointDescriptor), sizeof(USBEndpointDescriptor),
USBGenericDescriptor_ENDPOINT, USBGenericDescriptor_ENDPOINT,
USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_OUT, USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_OUT,
DATAOUT_2), PHONE_DATAOUT),
USBEndpointDescriptor_BULK, USBEndpointDescriptor_BULK,
MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(DATAOUT_2), MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAOUT),
USBEndpointDescriptor_MAXBULKSIZE_FS), USBEndpointDescriptor_MAXBULKSIZE_FS),
0 /* Must be 0 for full-speed bulk endpoints */ 0 /* Must be 0 for full-speed bulk endpoints */
}, },
@@ -511,9 +508,9 @@ const SIMTraceDriverConfigurationDescriptorMITM configurationDescriptorMITM = {
sizeof(USBEndpointDescriptor), sizeof(USBEndpointDescriptor),
USBGenericDescriptor_ENDPOINT, USBGenericDescriptor_ENDPOINT,
USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN, USBEndpointDescriptor_ADDRESS(USBEndpointDescriptor_IN,
DATAIN_2), PHONE_DATAIN),
USBEndpointDescriptor_BULK, USBEndpointDescriptor_BULK,
MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(DATAIN_2), MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_DATAIN),
USBEndpointDescriptor_MAXBULKSIZE_FS), USBEndpointDescriptor_MAXBULKSIZE_FS),
0 /* Must be 0 for full-speed bulk endpoints */ 0 /* Must be 0 for full-speed bulk endpoints */
}, },
@@ -521,9 +518,9 @@ const SIMTraceDriverConfigurationDescriptorMITM configurationDescriptorMITM = {
{ {
sizeof(USBEndpointDescriptor), sizeof(USBEndpointDescriptor),
USBGenericDescriptor_ENDPOINT, USBGenericDescriptor_ENDPOINT,
USBEndpointDescriptor_ADDRESS( USBEndpointDescriptor_IN, INT_2 ), USBEndpointDescriptor_ADDRESS( USBEndpointDescriptor_IN, PHONE_INT ),
USBEndpointDescriptor_INTERRUPT, USBEndpointDescriptor_INTERRUPT,
MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(INT_2), MIN(BOARD_USB_ENDPOINTS_MAXPACKETSIZE(PHONE_INT),
USBEndpointDescriptor_MAXINTERRUPTSIZE_FS), USBEndpointDescriptor_MAXINTERRUPTSIZE_FS),
0x10 0x10
} }