summaryrefslogtreecommitdiffstats
path: root/apps/plugins/zxbox
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2012-02-15 22:32:43 +0100
committerBertrik Sikken <bertrik@sikken.nl>2012-02-15 22:32:43 +0100
commitb193b75f62ff3be76f3cec120fe906c474b5caeb (patch)
treef33744a341b09e124e626be415730ca753396ce0 /apps/plugins/zxbox
parentf7fdf134681a35950edeb1054a1e095f7acec058 (diff)
downloadrockbox-b193b75f62ff3be76f3cec120fe906c474b5caeb.tar.gz
rockbox-b193b75f62ff3be76f3cec120fe906c474b5caeb.zip
zxbox: make source files include their header file and make function static where possible
Change-Id: I0c87563ee29f46948e3a559c27b1b22d4404cec1
Diffstat (limited to 'apps/plugins/zxbox')
-rw-r--r--apps/plugins/zxbox/interf.c1
-rw-r--r--apps/plugins/zxbox/spconf.h2
-rw-r--r--apps/plugins/zxbox/spscr.h1
-rw-r--r--apps/plugins/zxbox/spsound.c4
-rw-r--r--apps/plugins/zxbox/zxbox.c2
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c1
-rw-r--r--apps/plugins/zxbox/zxvid_com.h1
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 @@
*/
#include "zxconfig.h"
+#include "zxmisc.h"
#include "interf.h"
#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;
extern int spcf_init_tapefile_type;
-/*extern int spcf_read_conf_file(const char *filename);*/
+extern int spcf_read_conf_file(const char *filename);
extern void spcf_read_command_line(const void* parameter);
extern void spcf_read_xresources(void);
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 @@
#include "z80_type.h"
-extern int scrmul;
extern volatile int screen_visible;
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)
}
#endif
}
-void get_more(unsigned char** start, size_t* size)
+static void get_more(unsigned char** start, size_t* size)
{
doneplay = 1;
rb->pcm_play_stop();
@@ -199,7 +199,7 @@ void get_more(unsigned char** start, size_t* size)
/* sp_sound_buf is Unsigned 8 bit, Rate 8000 Hz, Mono */
-void write_buf(void){
+static void write_buf(void){
int i,j;
/* 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 @@
#include "zxconfig.h"
#include "spkey_p.h"
+#include "spkey.h"
spkeyboard kb_mkey;
bool exit_requested=false;
@@ -28,7 +29,6 @@ bool clear_kbd=0;
extern bool zxbox_menu(void);
/* DUMMIES ... to clean */
-unsigned int scrmul=0;
int privatemap;
int use_shm = 0;
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 @@
#include "zxconfig.h"
+#include "zxbox_keyb.h"
//#define ZX_WRITE_OUT_TEXT
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 @@
#endif
#include "spscr_p.h"
+#include "spscr.h"
#include "spmain.h"
#include "spperif.h"