diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-30 23:47:49 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-30 23:47:49 +0000 |
commit | 57933f2bc6cd404874e5772f35d9c10861d1f52e (patch) | |
tree | 63eb13fc550707e19f8624d5d2693111ee1f4c4a | |
parent | d73c81f912f51abcfb034ed3e563fd4b39db5854 (diff) | |
download | rockbox-57933f2bc6cd404874e5772f35d9c10861d1f52e.tar.gz rockbox-57933f2bc6cd404874e5772f35d9c10861d1f52e.zip |
Make some global function/variables local (by making them static)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27631 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 1 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 6 | ||||
-rw-r--r-- | apps/gui/statusbar-skinned.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525v2.c | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 559ae8519f..6b6db68023 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -68,6 +68,7 @@ | |||
68 | #include "wps_internals.h" | 68 | #include "wps_internals.h" |
69 | #include "skin_engine.h" | 69 | #include "skin_engine.h" |
70 | #include "statusbar-skinned.h" | 70 | #include "statusbar-skinned.h" |
71 | #include "skin_display.h" | ||
71 | 72 | ||
72 | void skin_render(struct gui_wps *gwps, unsigned refresh_mode); | 73 | void skin_render(struct gui_wps *gwps, unsigned refresh_mode); |
73 | 74 | ||
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index d81ccf62b3..ed7771529e 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -90,7 +90,7 @@ static enum screen_type curr_screen; | |||
90 | static struct skin_element *curr_viewport_element; | 90 | static struct skin_element *curr_viewport_element; |
91 | static struct skin_viewport *curr_vp; | 91 | static struct skin_viewport *curr_vp; |
92 | 92 | ||
93 | struct line *curr_line; | 93 | static struct line *curr_line; |
94 | 94 | ||
95 | static int follow_lang_direction = 0; | 95 | static int follow_lang_direction = 0; |
96 | 96 | ||
@@ -1173,7 +1173,7 @@ static int convert_viewport(struct wps_data *data, struct skin_element* element) | |||
1173 | 1173 | ||
1174 | } | 1174 | } |
1175 | 1175 | ||
1176 | int skin_element_callback(struct skin_element* element, void* data) | 1176 | static int skin_element_callback(struct skin_element* element, void* data) |
1177 | { | 1177 | { |
1178 | struct wps_data *wps_data = (struct wps_data *)data; | 1178 | struct wps_data *wps_data = (struct wps_data *)data; |
1179 | struct wps_token *token; | 1179 | struct wps_token *token; |
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index e05f97ff4e..b56fabeaa0 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -322,7 +322,7 @@ static void fix_line_alignment(struct skin_draw_info *info, struct skin_element | |||
322 | } | 322 | } |
323 | 323 | ||
324 | /* Draw a LINE element onto the display */ | 324 | /* Draw a LINE element onto the display */ |
325 | bool skin_render_line(struct skin_element* line, struct skin_draw_info *info) | 325 | static bool skin_render_line(struct skin_element* line, struct skin_draw_info *info) |
326 | { | 326 | { |
327 | bool needs_update = false; | 327 | bool needs_update = false; |
328 | int last_value, value; | 328 | int last_value, value; |
@@ -471,8 +471,8 @@ bool skin_render_alternator(struct skin_element* element, struct skin_draw_info | |||
471 | return changed_lines || ret; | 471 | return changed_lines || ret; |
472 | } | 472 | } |
473 | 473 | ||
474 | void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, | 474 | static void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, |
475 | struct skin_viewport* skin_viewport, unsigned long refresh_type) | 475 | struct skin_viewport* skin_viewport, unsigned long refresh_type) |
476 | { | 476 | { |
477 | struct screen *display = gwps->display; | 477 | struct screen *display = gwps->display; |
478 | char linebuf[MAX_LINE]; | 478 | char linebuf[MAX_LINE]; |
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index 8eb082d50f..213d8a1777 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c | |||
@@ -48,7 +48,7 @@ static struct wps_sync_data sb_skin_sync_data = { .do_full_update = false | |||
48 | 48 | ||
49 | /* initial setup of wps_data */ | 49 | /* initial setup of wps_data */ |
50 | static int update_delay = DEFAULT_UPDATE_DELAY; | 50 | static int update_delay = DEFAULT_UPDATE_DELAY; |
51 | struct wps_token *found_token; | 51 | static struct wps_token *found_token; |
52 | static int set_title_worker(char* title, enum themable_icons icon, | 52 | static int set_title_worker(char* title, enum themable_icons icon, |
53 | struct wps_data *data, struct skin_element *root) | 53 | struct wps_data *data, struct skin_element *root) |
54 | { | 54 | { |
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c index bee9689ae3..0ababd857d 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525.c +++ b/firmware/target/arm/as3525/usb-drv-as3525.c | |||
@@ -476,7 +476,7 @@ char *make_hex(char *data, int len) | |||
476 | } | 476 | } |
477 | #endif | 477 | #endif |
478 | 478 | ||
479 | void ep_send(int ep, void *ptr, int len) | 479 | static void ep_send(int ep, void *ptr, int len) |
480 | { | 480 | { |
481 | struct usb_dev_dma_desc *uc_desc = endpoints[ep][0].uc_desc; | 481 | struct usb_dev_dma_desc *uc_desc = endpoints[ep][0].uc_desc; |
482 | 482 | ||
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c index 1514e765cb..a1ea7e30ab 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.c +++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c | |||
@@ -100,7 +100,7 @@ static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS][2]; | |||
100 | /* setup packet for EP0 */ | 100 | /* setup packet for EP0 */ |
101 | static struct usb_ctrlrequest ep0_setup_pkt USB_DEVBSS_ATTR; | 101 | static struct usb_ctrlrequest ep0_setup_pkt USB_DEVBSS_ATTR; |
102 | /* state of EP0 */ | 102 | /* state of EP0 */ |
103 | enum ep0state ep0_state; | 103 | static enum ep0state ep0_state; |
104 | 104 | ||
105 | void usb_attach(void) | 105 | void usb_attach(void) |
106 | { | 106 | { |