catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-22 16:28:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Mark more local functions as static

Browse Source
This commit is contained in:
Harald Welte
2015-11-07 18:41:25 +01:00
parent 844db577f2
commit ec4fe2358b
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/src_simtrace/host_communication.c
View File

@@ -5,7 +5,7 @@ static bool check_for_pts = false;
static struct Usart_info usart_info = {.base = USART_PHONE, .id = ID_USART_PHONE, .state = USART_RCV}; static struct Usart_info usart_info = {.base = USART_PHONE, .id = ID_USART_PHONE, .state = USART_RCV};
void USB_write_callback(uint8_t *pArg, uint8_t status, uint32_t transferred, uint32_t remaining) static void USB_write_callback(uint8_t *pArg, uint8_t status, uint32_t transferred, uint32_t remaining)
{ {
if (status != USBD_STATUS_SUCCESS) { if (status != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USB err status: %d(%s)\n", __FUNCTION__, status); TRACE_ERROR("USB err status: %d(%s)\n", __FUNCTION__, status);
@@ -14,7 +14,7 @@ void USB_write_callback(uint8_t *pArg, uint8_t status, uint32_t transferred, uin
TRACE_DEBUG("WR_CB\n"); TRACE_DEBUG("WR_CB\n");
} }
int send_to_host() static int send_to_host()
{ {
static uint8_t msg[RING_BUFLEN]; static uint8_t msg[RING_BUFLEN];
int ret = 0; int ret = 0;

6
firmware/src_simtrace/phone.c
View File

@@ -101,8 +101,8 @@ static struct Usart_info usart_info = {.base = USART_PHONE, .id = ID_USART_PHONE
static uint8_t host_to_sim_buf[BUFLEN]; static uint8_t host_to_sim_buf[BUFLEN];
static bool change_fidi = false; static bool change_fidi = false;
void receive_from_host( void ); static void receive_from_host( void );
void sendResponse_to_phone( uint8_t *pArg, uint8_t status, uint32_t transferred, uint32_t remaining) static void sendResponse_to_phone( uint8_t *pArg, uint8_t status, uint32_t transferred, uint32_t remaining)
{ {
if (status != USBD_STATUS_SUCCESS) { if (status != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USB err status: %d (%s)\n", __FUNCTION__, status); TRACE_ERROR("USB err status: %d (%s)\n", __FUNCTION__, status);
@@ -135,7 +135,7 @@ void sendResponse_to_phone( uint8_t *pArg, uint8_t status, uint32_t transferred,
receive_from_host(); receive_from_host();
} }
void receive_from_host() static void receive_from_host()
{ {
int ret; int ret;
if ((ret = USBD_Read(PHONE_DATAOUT, &host_to_sim_buf, sizeof(host_to_sim_buf), if ((ret = USBD_Read(PHONE_DATAOUT, &host_to_sim_buf, sizeof(host_to_sim_buf),

2
firmware/src_simtrace/simtrace_iso7816.c
View File

@@ -43,7 +43,7 @@ volatile ringbuf sim_rcv_buf = { {0}, 0, 0 };
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Interrupt routines * Interrupt routines
*-----------------------------------------------------------------------------*/ *-----------------------------------------------------------------------------*/
void Callback_PhoneRST_ISR( uint8_t *pArg, uint8_t status, uint32_t transferred, uint32_t remaining) static void Callback_PhoneRST_ISR( uint8_t *pArg, uint8_t status, uint32_t transferred, uint32_t remaining)
{ {
printf("rstCB\n\r"); printf("rstCB\n\r");
PIO_EnableIt( &pinPhoneRST ) ; PIO_EnableIt( &pinPhoneRST ) ;

12
firmware/src_simtrace/usb.c
View File

@@ -149,7 +149,7 @@ enum strDescNum {
}; };
/** List of string descriptors used by the device */ /** List of string descriptors used by the device */
const unsigned char *stringDescriptors[] = { static const unsigned char *stringDescriptors[] = {
langDesc, langDesc,
productStringDescriptor, productStringDescriptor,
snifferConfigStringDescriptor, snifferConfigStringDescriptor,
@@ -173,7 +173,7 @@ typedef struct _SIMTraceDriverConfigurationDescriptorSniffer {
} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorSniffer; } __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorSniffer;
const SIMTraceDriverConfigurationDescriptorSniffer configurationDescriptorSniffer = { static const SIMTraceDriverConfigurationDescriptorSniffer configurationDescriptorSniffer = {
/* Standard configuration descriptor */ /* Standard configuration descriptor */
{ {
sizeof(USBConfigurationDescriptor), sizeof(USBConfigurationDescriptor),
@@ -252,7 +252,7 @@ typedef struct {
} __attribute__ ((packed)) CCIDDriverConfigurationDescriptors; } __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
*/ */
const CCIDDriverConfigurationDescriptors configurationDescriptorCCID = { static const CCIDDriverConfigurationDescriptors configurationDescriptorCCID = {
// Standard USB configuration descriptor // Standard USB configuration descriptor
{ {
@@ -349,7 +349,7 @@ typedef struct _SIMTraceDriverConfigurationDescriptorPhone {
USBEndpointDescriptor phone_interruptIn; USBEndpointDescriptor phone_interruptIn;
} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorPhone; } __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorPhone;
const SIMTraceDriverConfigurationDescriptorPhone configurationDescriptorPhone = { static const SIMTraceDriverConfigurationDescriptorPhone configurationDescriptorPhone = {
/* Standard configuration descriptor */ /* Standard configuration descriptor */
{ {
sizeof(USBConfigurationDescriptor), sizeof(USBConfigurationDescriptor),
@@ -429,7 +429,7 @@ typedef struct _SIMTraceDriverConfigurationDescriptorMITM {
} __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorMITM; } __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorMITM;
const SIMTraceDriverConfigurationDescriptorMITM configurationDescriptorMITM = { static const SIMTraceDriverConfigurationDescriptorMITM configurationDescriptorMITM = {
/* Standard configuration descriptor */ /* Standard configuration descriptor */
{ {
sizeof(USBConfigurationDescriptor), sizeof(USBConfigurationDescriptor),
@@ -587,7 +587,7 @@ const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
}; };
/* AT91SAM3S only supports full speed, but not high speed USB */ /* AT91SAM3S only supports full speed, but not high speed USB */
const USBDDriverDescriptors driverDescriptors = { static const USBDDriverDescriptors driverDescriptors = {
&deviceDescriptor, &deviceDescriptor,
(const USBConfigurationDescriptor **) &(configurationDescriptorsArr), /* first full-speed configuration descriptor */ (const USBConfigurationDescriptor **) &(configurationDescriptorsArr), /* first full-speed configuration descriptor */
0, /* No full-speed device qualifier descriptor */ 0, /* No full-speed device qualifier descriptor */