diff options
-rw-r--r-- | apps/plugins/pdbox/PDa/src/d_imayer_fft.c | 2 | ||||
-rw-r--r-- | firmware/drivers/ata_flash.c | 16 | ||||
-rw-r--r-- | firmware/events.c | 2 | ||||
-rw-r--r-- | firmware/ifp_usb_serial.c | 12 | ||||
-rw-r--r-- | flash/make_firmware/make_firmware.c | 4 | ||||
-rw-r--r-- | flash/minimon/minimon.c | 4 | ||||
-rw-r--r-- | lib/skin_parser/skin_parser.c | 6 | ||||
-rw-r--r-- | lib/skin_parser/skin_parser.h | 6 | ||||
-rw-r--r-- | lib/skin_parser/skin_scan.c | 4 | ||||
-rw-r--r-- | lib/skin_parser/skin_scan.h | 4 |
10 files changed, 30 insertions, 30 deletions
diff --git a/apps/plugins/pdbox/PDa/src/d_imayer_fft.c b/apps/plugins/pdbox/PDa/src/d_imayer_fft.c index a78b9370f4..f0d3f34b71 100644 --- a/apps/plugins/pdbox/PDa/src/d_imayer_fft.c +++ b/apps/plugins/pdbox/PDa/src/d_imayer_fft.c | |||
@@ -110,7 +110,7 @@ static long long halsec[TRIG_TAB_SIZE]= {1,2,3}; | |||
110 | #define SQRT2 ftofix(1.414213562373095048801688724209698) | 110 | #define SQRT2 ftofix(1.414213562373095048801688724209698) |
111 | 111 | ||
112 | 112 | ||
113 | void imayer_fht(t_fixed *fz, int n) | 113 | static void imayer_fht(t_fixed *fz, int n) |
114 | { | 114 | { |
115 | int k,k1,k2,k3,k4,kx; | 115 | int k,k1,k2,k3,k4,kx; |
116 | t_fixed *fi,*fn,*gi; | 116 | t_fixed *fi,*fn,*gi; |
diff --git a/firmware/drivers/ata_flash.c b/firmware/drivers/ata_flash.c index de2988b9be..96ea1cfa68 100644 --- a/firmware/drivers/ata_flash.c +++ b/firmware/drivers/ata_flash.c | |||
@@ -73,7 +73,7 @@ struct flash_disk | |||
73 | 73 | ||
74 | static struct flash_disk flash_disk; | 74 | static struct flash_disk flash_disk; |
75 | 75 | ||
76 | void flash_select_chip(int no, int sel) | 76 | static void flash_select_chip(int no, int sel) |
77 | { | 77 | { |
78 | #if CONFIG_FLASH == FLASH_IFP7XX | 78 | #if CONFIG_FLASH == FLASH_IFP7XX |
79 | if (sel) | 79 | if (sel) |
@@ -115,7 +115,7 @@ static void flash_wait_ready(void) | |||
115 | 115 | ||
116 | static unsigned char model_n_sectors_order[] = {0, 19, 20}; | 116 | static unsigned char model_n_sectors_order[] = {0, 19, 20}; |
117 | 117 | ||
118 | int flash_map_sector(int sector, int* chip, int* chip_sector) | 118 | static int flash_map_sector(int sector, int* chip, int* chip_sector) |
119 | { | 119 | { |
120 | int ord, c; | 120 | int ord, c; |
121 | if (flash_disk.model == FLASH_MODEL_NONE) | 121 | if (flash_disk.model == FLASH_MODEL_NONE) |
@@ -132,7 +132,7 @@ int flash_map_sector(int sector, int* chip, int* chip_sector) | |||
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | int flash_read_id(int no) { | 135 | static int flash_read_id(int no) { |
136 | int id; | 136 | int id; |
137 | 137 | ||
138 | flash_select_chip(no, 1); | 138 | flash_select_chip(no, 1); |
@@ -146,7 +146,7 @@ int flash_read_id(int no) { | |||
146 | return id; | 146 | return id; |
147 | } | 147 | } |
148 | 148 | ||
149 | int flash_read_sector(int sector, unsigned char* buf, | 149 | static int flash_read_sector(int sector, unsigned char* buf, |
150 | unsigned char* oob) | 150 | unsigned char* oob) |
151 | { | 151 | { |
152 | unsigned long *bufl = (unsigned long *)buf; | 152 | unsigned long *bufl = (unsigned long *)buf; |
@@ -204,7 +204,7 @@ int flash_read_sector(int sector, unsigned char* buf, | |||
204 | return 0; | 204 | return 0; |
205 | } | 205 | } |
206 | 206 | ||
207 | int flash_read_sector_oob(int sector, unsigned char* oob) | 207 | static int flash_read_sector_oob(int sector, unsigned char* oob) |
208 | { | 208 | { |
209 | int chip, chip_sector; | 209 | int chip, chip_sector; |
210 | int i; | 210 | int i; |
@@ -294,7 +294,7 @@ static int flash_get_logical_block_no(unsigned char* oob) | |||
294 | return -1; | 294 | return -1; |
295 | } | 295 | } |
296 | 296 | ||
297 | int flash_disk_scan(void) | 297 | static int flash_disk_scan(void) |
298 | { | 298 | { |
299 | int n_segments, n_phblocks; | 299 | int n_segments, n_phblocks; |
300 | unsigned char oob[16]; | 300 | unsigned char oob[16]; |
@@ -327,7 +327,7 @@ int flash_disk_scan(void) | |||
327 | return 0; | 327 | return 0; |
328 | } | 328 | } |
329 | 329 | ||
330 | int flash_disk_find_block(int block) | 330 | static int flash_disk_find_block(int block) |
331 | { | 331 | { |
332 | int seg, bmod, phb; | 332 | int seg, bmod, phb; |
333 | unsigned char oob[16]; | 333 | unsigned char oob[16]; |
@@ -356,7 +356,7 @@ int flash_disk_find_block(int block) | |||
356 | return flash_disk.cur_phblock_start; | 356 | return flash_disk.cur_phblock_start; |
357 | } | 357 | } |
358 | 358 | ||
359 | int flash_disk_read_sectors(unsigned long start, | 359 | static int flash_disk_read_sectors(unsigned long start, |
360 | int count, | 360 | int count, |
361 | void* buf) | 361 | void* buf) |
362 | { | 362 | { |
diff --git a/firmware/events.c b/firmware/events.c index 3386c02465..8015442cc2 100644 --- a/firmware/events.c +++ b/firmware/events.c | |||
@@ -81,7 +81,7 @@ bool add_event_ex(unsigned short id, bool oneshot, void (*handler)(unsigned shor | |||
81 | return do_add_event(id, oneshot, true, handler, user_data); | 81 | return do_add_event(id, oneshot, true, handler, user_data); |
82 | } | 82 | } |
83 | 83 | ||
84 | void do_remove_event(unsigned short id, bool user_data_valid, | 84 | static void do_remove_event(unsigned short id, bool user_data_valid, |
85 | void *handler, void *user_data) | 85 | void *handler, void *user_data) |
86 | { | 86 | { |
87 | int i; | 87 | int i; |
diff --git a/firmware/ifp_usb_serial.c b/firmware/ifp_usb_serial.c index 5392de0d52..f7e3a51858 100644 --- a/firmware/ifp_usb_serial.c +++ b/firmware/ifp_usb_serial.c | |||
@@ -250,7 +250,7 @@ static inline void usb_select_setup_endpoint(void) | |||
250 | ISP1582_EPINDEX = 0x20; | 250 | ISP1582_EPINDEX = 0x20; |
251 | } | 251 | } |
252 | 252 | ||
253 | void usb_setup_endpoint(int idx, int max_pkt_size, int type) | 253 | static void usb_setup_endpoint(int idx, int max_pkt_size, int type) |
254 | { | 254 | { |
255 | struct usb_endpoint *ep; | 255 | struct usb_endpoint *ep; |
256 | 256 | ||
@@ -271,7 +271,7 @@ void usb_setup_endpoint(int idx, int max_pkt_size, int type) | |||
271 | ep->max_pkt_size[epidx_dir(idx)] = max_pkt_size; | 271 | ep->max_pkt_size[epidx_dir(idx)] = max_pkt_size; |
272 | } | 272 | } |
273 | 273 | ||
274 | void usb_disable_endpoint(int idx) | 274 | static void usb_disable_endpoint(int idx) |
275 | { | 275 | { |
276 | usb_select_endpoint(idx); | 276 | usb_select_endpoint(idx); |
277 | ISP1582_EPTYPE &= 8; | 277 | ISP1582_EPTYPE &= 8; |
@@ -288,12 +288,12 @@ void usb_reconnect(void) | |||
288 | ISP1582_MODE |= 1; /* SOFTCT on */ | 288 | ISP1582_MODE |= 1; /* SOFTCT on */ |
289 | } | 289 | } |
290 | 290 | ||
291 | void usb_cleanup(void) | 291 | static void usb_cleanup(void) |
292 | { | 292 | { |
293 | ISP1582_MODE &= ~1; /* SOFTCT off */ | 293 | ISP1582_MODE &= ~1; /* SOFTCT off */ |
294 | } | 294 | } |
295 | 295 | ||
296 | void usb_setup(int reset) | 296 | static void usb_setup(int reset) |
297 | { | 297 | { |
298 | int i; | 298 | int i; |
299 | 299 | ||
@@ -840,7 +840,7 @@ static void usb_handle_int(int i) | |||
840 | 840 | ||
841 | } | 841 | } |
842 | 842 | ||
843 | void usb_handle_interrupts(void) | 843 | static void usb_handle_interrupts(void) |
844 | { | 844 | { |
845 | #ifdef LCD_DEBUG | 845 | #ifdef LCD_DEBUG |
846 | char s[20]; | 846 | char s[20]; |
@@ -1002,7 +1002,7 @@ static void serial_free_out_fifo(int ep, unsigned char *buf, int len) | |||
1002 | serial_restart_output(ep); | 1002 | serial_restart_output(ep); |
1003 | } | 1003 | } |
1004 | 1004 | ||
1005 | void usb_serial_handle(void) | 1005 | static void usb_serial_handle(void) |
1006 | { | 1006 | { |
1007 | #ifdef BUTTONS | 1007 | #ifdef BUTTONS |
1008 | static int t = 0; | 1008 | static int t = 0; |
diff --git a/flash/make_firmware/make_firmware.c b/flash/make_firmware/make_firmware.c index a79f2b970d..bd838bf3bf 100644 --- a/flash/make_firmware/make_firmware.c +++ b/flash/make_firmware/make_firmware.c | |||
@@ -69,7 +69,7 @@ UINT32 Read32(UINT8* pByte) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
72 | UINT32 CalcCRC32 (const UINT8* buf, UINT32 len) | 72 | static UINT32 CalcCRC32 (const UINT8* buf, UINT32 len) |
73 | { | 73 | { |
74 | static const UINT32 crc_table[256] = | 74 | static const UINT32 crc_table[256] = |
75 | { // CRC32 lookup table for polynomial 0x04C11DB7 | 75 | { // CRC32 lookup table for polynomial 0x04C11DB7 |
@@ -127,7 +127,7 @@ UINT32 CalcCRC32 (const UINT8* buf, UINT32 len) | |||
127 | } | 127 | } |
128 | 128 | ||
129 | 129 | ||
130 | UINT32 PlaceImage(char* filename, UINT32 pos, UINT8* pFirmware, UINT32 limit) | 130 | static UINT32 PlaceImage(char* filename, UINT32 pos, UINT8* pFirmware, UINT32 limit) |
131 | { | 131 | { |
132 | UINT32 size, read; | 132 | UINT32 size, read; |
133 | FILE* pFile; | 133 | FILE* pFile; |
diff --git a/flash/minimon/minimon.c b/flash/minimon/minimon.c index f34e94ac62..aca9cb5523 100644 --- a/flash/minimon/minimon.c +++ b/flash/minimon/minimon.c | |||
@@ -21,7 +21,7 @@ int main(void); | |||
21 | tpMain start_vector[] __attribute__ ((section (".startvector"))) = {main}; | 21 | tpMain start_vector[] __attribute__ ((section (".startvector"))) = {main}; |
22 | 22 | ||
23 | 23 | ||
24 | UINT8 uart_read(void) | 24 | static UINT8 uart_read(void) |
25 | { | 25 | { |
26 | UINT8 byte; | 26 | UINT8 byte; |
27 | while (!(SSR1 & SCI_RDRF)); // wait for char to be available | 27 | while (!(SSR1 & SCI_RDRF)); // wait for char to be available |
@@ -31,7 +31,7 @@ UINT8 uart_read(void) | |||
31 | } | 31 | } |
32 | 32 | ||
33 | 33 | ||
34 | void uart_write(UINT8 byte) | 34 | static void uart_write(UINT8 byte) |
35 | { | 35 | { |
36 | while (!(SSR1 & SCI_TDRE)); // wait for transmit buffer empty | 36 | while (!(SSR1 & SCI_TDRE)); // wait for transmit buffer empty |
37 | TDR1 = byte; | 37 | TDR1 = byte; |
diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c index a26e6ce474..b5ad023d0a 100644 --- a/lib/skin_parser/skin_parser.c +++ b/lib/skin_parser/skin_parser.c | |||
@@ -1142,7 +1142,7 @@ static struct skin_element* skin_parse_code_as_arg(const char** document) | |||
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | /* Memory management */ | 1144 | /* Memory management */ |
1145 | struct skin_element* skin_alloc_element() | 1145 | static struct skin_element* skin_alloc_element() |
1146 | { | 1146 | { |
1147 | struct skin_element* retval = (struct skin_element*) | 1147 | struct skin_element* retval = (struct skin_element*) |
1148 | skin_buffer_alloc(sizeof(struct skin_element)); | 1148 | skin_buffer_alloc(sizeof(struct skin_element)); |
@@ -1164,7 +1164,7 @@ struct skin_element* skin_alloc_element() | |||
1164 | * enough for any tag. params should be used straight away by the callback | 1164 | * enough for any tag. params should be used straight away by the callback |
1165 | * so this is safe. | 1165 | * so this is safe. |
1166 | */ | 1166 | */ |
1167 | struct skin_tag_parameter* skin_alloc_params(int count) | 1167 | static struct skin_tag_parameter* skin_alloc_params(int count) |
1168 | { | 1168 | { |
1169 | size_t size = sizeof(struct skin_tag_parameter) * count; | 1169 | size_t size = sizeof(struct skin_tag_parameter) * count; |
1170 | return (struct skin_tag_parameter*)skin_buffer_alloc(size); | 1170 | return (struct skin_tag_parameter*)skin_buffer_alloc(size); |
@@ -1176,7 +1176,7 @@ char* skin_alloc_string(int length) | |||
1176 | return (char*)skin_buffer_alloc(sizeof(char) * (length + 1)); | 1176 | return (char*)skin_buffer_alloc(sizeof(char) * (length + 1)); |
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | OFFSETTYPE(struct skin_element*)* skin_alloc_children(int count) | 1179 | static OFFSETTYPE(struct skin_element*)* skin_alloc_children(int count) |
1180 | { | 1180 | { |
1181 | return (OFFSETTYPE(struct skin_element*)*) | 1181 | return (OFFSETTYPE(struct skin_element*)*) |
1182 | skin_buffer_alloc(sizeof(struct skin_element*) * count); | 1182 | skin_buffer_alloc(sizeof(struct skin_element*) * count); |
diff --git a/lib/skin_parser/skin_parser.h b/lib/skin_parser/skin_parser.h index c53896ca30..c59072594f 100644 --- a/lib/skin_parser/skin_parser.h +++ b/lib/skin_parser/skin_parser.h | |||
@@ -160,9 +160,9 @@ struct skin_element* skin_parse(const char* document, | |||
160 | struct skin_element* skin_parse(const char* document); | 160 | struct skin_element* skin_parse(const char* document); |
161 | #endif | 161 | #endif |
162 | /* Memory management functions */ | 162 | /* Memory management functions */ |
163 | struct skin_element* skin_alloc_element(void); | 163 | static struct skin_element* skin_alloc_element(void); |
164 | OFFSETTYPE(struct skin_element*)* skin_alloc_children(int count); | 164 | static OFFSETTYPE(struct skin_element*)* skin_alloc_children(int count); |
165 | struct skin_tag_parameter* skin_alloc_params(int count); | 165 | static struct skin_tag_parameter* skin_alloc_params(int count); |
166 | char* skin_alloc_string(int length); | 166 | char* skin_alloc_string(int length); |
167 | 167 | ||
168 | void skin_free_tree(struct skin_element* root); | 168 | void skin_free_tree(struct skin_element* root); |
diff --git a/lib/skin_parser/skin_scan.c b/lib/skin_parser/skin_scan.c index f93606d54d..c5ce595ddd 100644 --- a/lib/skin_parser/skin_scan.c +++ b/lib/skin_parser/skin_scan.c | |||
@@ -89,7 +89,7 @@ void skip_tag(const char** document) | |||
89 | skip_enumlist(document); | 89 | skip_enumlist(document); |
90 | } | 90 | } |
91 | 91 | ||
92 | void skip_arglist(const char** document) | 92 | static void skip_arglist(const char** document) |
93 | { | 93 | { |
94 | if(**document == ARGLISTOPENSYM) | 94 | if(**document == ARGLISTOPENSYM) |
95 | (*document)++; | 95 | (*document)++; |
@@ -106,7 +106,7 @@ void skip_arglist(const char** document) | |||
106 | (*document)++; | 106 | (*document)++; |
107 | } | 107 | } |
108 | 108 | ||
109 | void skip_enumlist(const char** document) | 109 | static void skip_enumlist(const char** document) |
110 | { | 110 | { |
111 | if(**document == ENUMLISTOPENSYM) | 111 | if(**document == ENUMLISTOPENSYM) |
112 | (*document)++; | 112 | (*document)++; |
diff --git a/lib/skin_parser/skin_scan.h b/lib/skin_parser/skin_scan.h index 6281582b88..b1f842b8ce 100644 --- a/lib/skin_parser/skin_scan.h +++ b/lib/skin_parser/skin_scan.h | |||
@@ -31,8 +31,8 @@ extern "C" | |||
31 | /* Scanning functions */ | 31 | /* Scanning functions */ |
32 | void skip_tag(const char** document); | 32 | void skip_tag(const char** document); |
33 | void skip_comment(const char** document); | 33 | void skip_comment(const char** document); |
34 | void skip_arglist(const char** document); | 34 | static void skip_arglist(const char** document); |
35 | void skip_enumlist(const char** document); | 35 | static void skip_enumlist(const char** document); |
36 | char* scan_string(const char** document); | 36 | char* scan_string(const char** document); |
37 | int scan_int(const char** document); | 37 | int scan_int(const char** document); |
38 | int check_viewport(const char* document); /* Checks for a viewport declaration */ | 38 | int check_viewport(const char* document); /* Checks for a viewport declaration */ |