diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2012-02-15 22:32:43 +0100 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2012-02-15 22:32:43 +0100 |
commit | b193b75f62ff3be76f3cec120fe906c474b5caeb (patch) | |
tree | f33744a341b09e124e626be415730ca753396ce0 | |
parent | f7fdf134681a35950edeb1054a1e095f7acec058 (diff) | |
download | rockbox-b193b75f62ff3be76f3cec120fe906c474b5caeb.tar.gz rockbox-b193b75f62ff3be76f3cec120fe906c474b5caeb.zip |
zxbox: make source files include their header file and make function static where possible
Change-Id: I0c87563ee29f46948e3a559c27b1b22d4404cec1
-rw-r--r-- | apps/plugins/zxbox/interf.c | 1 | ||||
-rw-r--r-- | apps/plugins/zxbox/spconf.h | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/spscr.h | 1 | ||||
-rw-r--r-- | apps/plugins/zxbox/spsound.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox.c | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 1 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxvid_com.h | 1 |
7 files changed, 7 insertions, 5 deletions
diff --git a/apps/plugins/zxbox/interf.c b/apps/plugins/zxbox/interf.c index 10c3dfa363..e0929a1f60 100644 --- a/apps/plugins/zxbox/interf.c +++ b/apps/plugins/zxbox/interf.c | |||
@@ -19,6 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include "zxconfig.h" | 21 | #include "zxconfig.h" |
22 | #include "zxmisc.h" | ||
22 | #include "interf.h" | 23 | #include "interf.h" |
23 | 24 | ||
24 | #include <stdio.h> | 25 | #include <stdio.h> |
diff --git a/apps/plugins/zxbox/spconf.h b/apps/plugins/zxbox/spconf.h index 7de5d2e857..5a6a05ffba 100644 --- a/apps/plugins/zxbox/spconf.h +++ b/apps/plugins/zxbox/spconf.h | |||
@@ -30,7 +30,7 @@ extern char *spcf_init_tapefile; | |||
30 | extern int spcf_init_tapefile_type; | 30 | extern int spcf_init_tapefile_type; |
31 | 31 | ||
32 | 32 | ||
33 | /*extern int spcf_read_conf_file(const char *filename);*/ | 33 | extern int spcf_read_conf_file(const char *filename); |
34 | extern void spcf_read_command_line(const void* parameter); | 34 | extern void spcf_read_command_line(const void* parameter); |
35 | extern void spcf_read_xresources(void); | 35 | extern void spcf_read_xresources(void); |
36 | extern int spcf_find_file_type(char *filename, int *ftp, int *ftsubp); | 36 | extern int spcf_find_file_type(char *filename, int *ftp, int *ftsubp); |
diff --git a/apps/plugins/zxbox/spscr.h b/apps/plugins/zxbox/spscr.h index b90dabd7f4..6adb988bf9 100644 --- a/apps/plugins/zxbox/spscr.h +++ b/apps/plugins/zxbox/spscr.h | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include "z80_type.h" | 24 | #include "z80_type.h" |
25 | 25 | ||
26 | extern int scrmul; | ||
27 | extern volatile int screen_visible; | 26 | extern volatile int screen_visible; |
28 | 27 | ||
29 | extern void init_spect_scr(void); | 28 | extern void init_spect_scr(void); |
diff --git a/apps/plugins/zxbox/spsound.c b/apps/plugins/zxbox/spsound.c index 6a550e2033..8b3aa3d84f 100644 --- a/apps/plugins/zxbox/spsound.c +++ b/apps/plugins/zxbox/spsound.c | |||
@@ -189,7 +189,7 @@ void autoclose_sound(void) | |||
189 | } | 189 | } |
190 | #endif | 190 | #endif |
191 | } | 191 | } |
192 | void get_more(unsigned char** start, size_t* size) | 192 | static void get_more(unsigned char** start, size_t* size) |
193 | { | 193 | { |
194 | doneplay = 1; | 194 | doneplay = 1; |
195 | rb->pcm_play_stop(); | 195 | rb->pcm_play_stop(); |
@@ -199,7 +199,7 @@ void get_more(unsigned char** start, size_t* size) | |||
199 | 199 | ||
200 | /* sp_sound_buf is Unsigned 8 bit, Rate 8000 Hz, Mono */ | 200 | /* sp_sound_buf is Unsigned 8 bit, Rate 8000 Hz, Mono */ |
201 | 201 | ||
202 | void write_buf(void){ | 202 | static void write_buf(void){ |
203 | int i,j; | 203 | int i,j; |
204 | 204 | ||
205 | /* still not sure what is the best way to do this */ | 205 | /* still not sure what is the best way to do this */ |
diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c index edaa7cfbaa..81a79dc70a 100644 --- a/apps/plugins/zxbox/zxbox.c +++ b/apps/plugins/zxbox/zxbox.c | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include "zxconfig.h" | 22 | #include "zxconfig.h" |
23 | #include "spkey_p.h" | 23 | #include "spkey_p.h" |
24 | #include "spkey.h" | ||
24 | 25 | ||
25 | spkeyboard kb_mkey; | 26 | spkeyboard kb_mkey; |
26 | bool exit_requested=false; | 27 | bool exit_requested=false; |
@@ -28,7 +29,6 @@ bool clear_kbd=0; | |||
28 | extern bool zxbox_menu(void); | 29 | extern bool zxbox_menu(void); |
29 | 30 | ||
30 | /* DUMMIES ... to clean */ | 31 | /* DUMMIES ... to clean */ |
31 | unsigned int scrmul=0; | ||
32 | int privatemap; | 32 | int privatemap; |
33 | int use_shm = 0; | 33 | int use_shm = 0; |
34 | int small_screen,pause_on_iconify; | 34 | int small_screen,pause_on_iconify; |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 0d4b889a9b..06ca373689 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #include "zxconfig.h" | 1 | #include "zxconfig.h" |
2 | #include "zxbox_keyb.h" | ||
2 | 3 | ||
3 | //#define ZX_WRITE_OUT_TEXT | 4 | //#define ZX_WRITE_OUT_TEXT |
4 | 5 | ||
diff --git a/apps/plugins/zxbox/zxvid_com.h b/apps/plugins/zxbox/zxvid_com.h index 1e23ca03e3..a28bdaecbb 100644 --- a/apps/plugins/zxbox/zxvid_com.h +++ b/apps/plugins/zxbox/zxvid_com.h | |||
@@ -7,6 +7,7 @@ | |||
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | #include "spscr_p.h" | 9 | #include "spscr_p.h" |
10 | #include "spscr.h" | ||
10 | #include "spmain.h" | 11 | #include "spmain.h" |
11 | #include "spperif.h" | 12 | #include "spperif.h" |
12 | 13 | ||