With all the little changes that are needed to get an almost clean
compile.
/opt/rtems-4.11/lm32-rtems4.11/milkymist/lib/include/lop/lop_lowlevel.h
is the only problem left.
---
src/Makefile | 3 ++-
src/config.h | 2 +-
src/fb.h | 10 +++++-----
src/fbgrab.c | 2 +-
src/gui/about.h | 4 ++--
src/gui/audio.c | 2 +-
src/gui/audio.h | 6 +++---
src/gui/cp.c | 4 ++--
src/gui/cp.h | 6 +++---
src/gui/dmx.c | 2 +-
src/gui/dmx.h | 6 +++---
src/gui/dmxdesk.h | 6 +++---
src/gui/dmxspy.h | 6 +++---
src/gui/filemanager.h | 4 ++--
src/gui/firstpatch.h | 4 ++--
src/gui/flash.c | 14 +++++++-------
src/gui/flash.h | 2 +-
src/gui/guirender.h | 4 ++--
src/gui/ir.c | 8 ++++----
src/gui/ir.h | 4 ++--
src/gui/keyboard.c | 8 ++++----
src/gui/keyboard.h | 4 ++--
src/gui/messagebox.h | 2 +-
src/gui/midi.c | 8 ++++----
src/gui/midi.h | 4 ++--
src/gui/monitor.h | 6 +++---
src/gui/oscsettings.c | 8 ++++----
src/gui/oscsettings.h | 4 ++--
src/gui/patcheditor.c | 4 ++--
src/gui/patcheditor.h | 4 ++--
src/gui/performance.c | 22 +++++++++++-----------
src/gui/performance.h | 4 ++--
src/gui/rsswall.c | 6 +++---
src/gui/rsswall.h | 8 ++++----
src/gui/shutdown.h | 4 ++--
src/gui/sysettings.c | 24 ++++++++++++------------
src/gui/sysettings.h | 6 +++---
src/gui/videoin.c | 4 ++--
src/gui/videoin.h | 6 +++---
src/input.c | 2 +-
src/input.h | 4 ++--
src/osc.h | 2 +-
src/shortcuts.c | 4 ++--
src/shortcuts.h | 2 +-
src/sysconfig.c | 18 +++++++++---------
src/sysconfig.h | 18 +++++++++---------
src/version.c | 2 +-
src/version.h | 2 +-
48 files changed, 145 insertions(+), 144 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index e4260d3..a36666b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -27,7 +27,8 @@ else
RANLIB = $(RANLIB_quiet)
endif
-CFLAGS = -O9 -Wall -mbarrel-shift-enabled -mmultiply-enabled \
+CFLAGS = -O9 -Wall -Wstrict-prototypes \
+ -mbarrel-shift-enabled -mmultiply-enabled \
-mdivide-enabled -msign-extend-enabled -fsingle-precision-constant \
-I$(RTEMS_MAKEFILE_PATH)/lib/include -g
LDFLAGS = -mbarrel-shift-enabled -mmultiply-enabled -mdivide-enabled \
diff --git a/src/config.h b/src/config.h
index 0049b5e..c9b151c 100644
--- a/src/config.h
+++ b/src/config.h
@@ -27,7 +27,7 @@ const char *config_read_string(const char *key);
void config_write_string(const char *key, const char *value);
void config_delete(const char *key);
-void config_free();
+void config_free(void);
int config_load(const char *filename);
int config_save(const char *filename);
diff --git a/src/fb.h b/src/fb.h
index e788928..02c4391 100644
--- a/src/fb.h
+++ b/src/fb.h
@@ -21,10 +21,10 @@
extern int framebuffer_fd;
void init_fb_mtk(int quiet);
-void fb_unblank();
-void fb_render_mode();
-void fb_gui_mode();
-void fb_resize_gui();
-int fb_get_mode();
+void fb_unblank(void);
+void fb_render_mode(void);
+void fb_gui_mode(void);
+void fb_resize_gui(void);
+int fb_get_mode(void);
#endif /* __FB_H */
diff --git a/src/fbgrab.c b/src/fbgrab.c
index f03e596..60a789c 100644
--- a/src/fbgrab.c
+++ b/src/fbgrab.c
@@ -33,7 +33,7 @@
static char *filename = "/ssd/Screenshot-00.png";
-static char *get_name()
+static char *get_name(void)
{
struct stat st;
int i, result;
diff --git a/src/gui/about.h b/src/gui/about.h
index fb6118e..eca8a6d 100644
--- a/src/gui/about.h
+++ b/src/gui/about.h
@@ -18,7 +18,7 @@
#ifndef __ABOUT_H
#define __ABOUT_H
-void init_about();
-void open_about_window();
+void init_about(void);
+void open_about_window(void);
#endif /* __ABOUT_H */
diff --git a/src/gui/audio.c b/src/gui/audio.c
index b4a7564..6a6b960 100644
--- a/src/gui/audio.c
+++ b/src/gui/audio.c
@@ -109,7 +109,7 @@ void load_audio_config()
set_level(1, mic_vol);
}
-static void set_config()
+static void set_config(void)
{
config_write_int("line_vol", line_vol);
config_write_int("line_mute", line_mute);
diff --git a/src/gui/audio.h b/src/gui/audio.h
index 208526b..43df1b6 100644
--- a/src/gui/audio.h
+++ b/src/gui/audio.h
@@ -18,8 +18,8 @@
#ifndef __AUDIO_H
#define __AUDIO_H
-void init_audio();
-void open_audio_window();
-void load_audio_config();
+void init_audio(void);
+void open_audio_window(void);
+void load_audio_config(void);
#endif /* __AUDIO_H */
diff --git a/src/gui/cp.c b/src/gui/cp.c
index 7c1f5f2..2f26621 100644
--- a/src/gui/cp.c
+++ b/src/gui/cp.c
@@ -61,13 +61,13 @@ void cp_notify_changed()
mtk_cmd(appid, "w.set(-title \"Control panel *\")");
}
-static void clear_changed()
+static void clear_changed(void)
{
mtk_cmd(appid, "w.set(-title \"Control panel\")");
changed = 0;
}
-static void on_config_change()
+static void on_config_change(void)
{
/* reload config for controls that need modification of some state */
load_audio_config();
diff --git a/src/gui/cp.h b/src/gui/cp.h
index 30178b1..301bad1 100644
--- a/src/gui/cp.h
+++ b/src/gui/cp.h
@@ -18,8 +18,8 @@
#ifndef __CP_H
#define __CP_H
-void init_cp();
-void cp_notify_changed();
-void cp_autostart();
+void init_cp(void);
+void cp_notify_changed(void);
+void cp_autostart(void);
#endif /* __CP_H */
diff --git a/src/gui/dmx.c b/src/gui/dmx.c
index d1bfa87..ff02615 100644
--- a/src/gui/dmx.c
+++ b/src/gui/dmx.c
@@ -82,7 +82,7 @@ void load_dmx_config()
set_chain_mode(config_read_int("dmx_chain", 1));
}
-static void set_config()
+static void set_config(void)
{
int i, value;
char confname[16];
diff --git a/src/gui/dmx.h b/src/gui/dmx.h
index 49b3d6a..5a64882 100644
--- a/src/gui/dmx.h
+++ b/src/gui/dmx.h
@@ -18,8 +18,8 @@
#ifndef __DMX_H
#define __DMX_H
-void init_dmx();
-void open_dmx_window();
-void load_dmx_config();
+void init_dmx(void);
+void open_dmx_window(void);
+void load_dmx_config(void);
#endif /* __DMX_H */
diff --git a/src/gui/dmxdesk.h b/src/gui/dmxdesk.h
index 2a025b6..97b5bf0 100644
--- a/src/gui/dmxdesk.h
+++ b/src/gui/dmxdesk.h
@@ -18,8 +18,8 @@
#ifndef __DMXDESK_H
#define __DMXDESK_H
-void init_dmxdesk();
-void open_dmxdesk_window();
-void close_dmxdesk_window();
+void init_dmxdesk(void);
+void open_dmxdesk_window(void);
+void close_dmxdesk_window(void);
#endif /* __DMXTABLE_H */
diff --git a/src/gui/dmxspy.h b/src/gui/dmxspy.h
index b98533b..c8f7a24 100644
--- a/src/gui/dmxspy.h
+++ b/src/gui/dmxspy.h
@@ -18,8 +18,8 @@
#ifndef __DMXSPY_H
#define __DMXSPY_H
-void init_dmxspy();
-void open_dmxspy_window();
-void close_dmxspy_window();
+void init_dmxspy(void);
+void open_dmxspy_window(void);
+void close_dmxspy_window(void);
#endif /* __DMXSPY_H */
diff --git a/src/gui/filemanager.h b/src/gui/filemanager.h
index c60de58..ffb28ea 100644
--- a/src/gui/filemanager.h
+++ b/src/gui/filemanager.h
@@ -18,7 +18,7 @@
#ifndef __FILEMANAGER_H
#define __FILEMANAGER_H
-void init_filemanager();
-void open_filemanager_window();
+void init_filemanager(void);
+void open_filemanager_window(void);
#endif /* __FILEMANAGER_H */
diff --git a/src/gui/firstpatch.h b/src/gui/firstpatch.h
index 9a1b963..6da69fd 100644
--- a/src/gui/firstpatch.h
+++ b/src/gui/firstpatch.h
@@ -18,7 +18,7 @@
#ifndef __FIRSTPATCH_H
#define __FIRSTPATCH_H
-void init_firstpatch();
-void open_firstpatch_window();
+void init_firstpatch(void);
+void open_firstpatch_window(void);
#endif /* __FIRSTPATCH_H */
diff --git a/src/gui/flash.c b/src/gui/flash.c
index 693ff79..9ec9c01 100644
--- a/src/gui/flash.c
+++ b/src/gui/flash.c
@@ -390,7 +390,7 @@ static void get_versions(struct patchpool *local_patches,
struct patchpool *remo
flash_progress = 100;
}
-static void download_images()
+static void download_images(void)
{
int rescue;
@@ -484,7 +484,7 @@ static void download_patches(struct patchpool *pp)
}
}
-static void flash_images()
+static void flash_images(void)
{
if(bitstream_name[0] != 0) {
flashvalid_val = flashvalid_bitstream(bitstream_name);
@@ -546,7 +546,7 @@ static rtems_task flash_task(rtems_task_argument argument)
flash_terminate(FLASH_STATE_SUCCESS);
}
-static int flash_busy()
+static int flash_busy(void)
{
switch(flash_state) {
case FLASH_STATE_READY:
@@ -564,7 +564,7 @@ static int flash_busy()
}
}
-static void update_progress();
+static void update_progress(void);
#define UPDATE_PERIOD 40
static rtems_interval next_update;
@@ -593,12 +593,12 @@ static void display_flashvalid_message(const char *n)
}
}
-static void update_done()
+static void update_done(void)
{
input_delete_callback(refresh_callback);
}
-static void update_progress()
+static void update_progress(void)
{
if(installed_patches < 0)
mtk_cmd(appid, "l_patchpool_i.set(-text \"\e?\")");
@@ -745,7 +745,7 @@ static void closefiles_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w_files.close()");
}
-static void flash_filedialog_ok_callback()
+static void flash_filedialog_ok_callback(void *arg)
{
char filepath[384];
diff --git a/src/gui/flash.h b/src/gui/flash.h
index 37ffcef..921ff2f 100644
--- a/src/gui/flash.h
+++ b/src/gui/flash.h
@@ -18,7 +18,7 @@
#ifndef __FLASH_H
#define __FLASH_H
-void init_flash();
+void init_flash(void);
void open_flash_window(int automatic);
#endif /* __FLASH_H */
diff --git a/src/gui/guirender.h b/src/gui/guirender.h
index 13f5483..f7cfe68 100644
--- a/src/gui/guirender.h
+++ b/src/gui/guirender.h
@@ -20,9 +20,9 @@
#include "../compiler/compiler.h"
-typedef void (*guirender_stop_callback)();
+typedef void (*guirender_stop_callback)(void);
int guirender(int appid, struct patch *p, guirender_stop_callback cb);
-void guirender_stop();
+void guirender_stop(void);
#endif /* __GUIRENDER_H */
diff --git a/src/gui/ir.c b/src/gui/ir.c
index bffa015..facfc2c 100644
--- a/src/gui/ir.c
+++ b/src/gui/ir.c
@@ -42,7 +42,7 @@ static int w_open;
static char key_bindings[64][384];
-static void load_config()
+static void load_config(void)
{
char config_key[6];
int i;
@@ -59,7 +59,7 @@ static void load_config()
}
}
-static void set_config()
+static void set_config(void)
{
char config_key[6];
int i;
@@ -74,7 +74,7 @@ static void set_config()
}
}
-static void update_list()
+static void update_list(void)
{
char str[32768];
char *p;
@@ -129,7 +129,7 @@ static void ir_event(mtk_event *e, int count)
}
}
-static void close_window()
+static void close_window(void)
{
mtk_cmd(appid, "w.close()");
input_delete_callback(ir_event);
diff --git a/src/gui/ir.h b/src/gui/ir.h
index 90e71db..8904659 100644
--- a/src/gui/ir.h
+++ b/src/gui/ir.h
@@ -18,7 +18,7 @@
#ifndef __IR_H
#define __IR_H
-void init_ir();
-void open_ir_window();
+void init_ir(void);
+void open_ir_window(void);
#endif /* __IR_H */
diff --git a/src/gui/keyboard.c b/src/gui/keyboard.c
index 47a26f7..409f16c 100644
--- a/src/gui/keyboard.c
+++ b/src/gui/keyboard.c
@@ -40,7 +40,7 @@ static int w_open;
static char key_bindings[26][384];
-static void load_config()
+static void load_config(void)
{
char config_key[6];
int i;
@@ -58,7 +58,7 @@ static void load_config()
}
}
-static void set_config()
+static void set_config(void)
{
char config_key[6];
int i;
@@ -74,7 +74,7 @@ static void set_config()
}
}
-static void update_list()
+static void update_list(void)
{
char str[32768];
char *p;
@@ -133,7 +133,7 @@ static void cancel_callback(mtk_event *e, void *arg)
close_filedialog(browse_dlg);
}
-static void browse_ok_callback()
+static void browse_ok_callback(void *arg)
{
char filename[384];
diff --git a/src/gui/keyboard.h b/src/gui/keyboard.h
index 0d40890..627ad57 100644
--- a/src/gui/keyboard.h
+++ b/src/gui/keyboard.h
@@ -18,7 +18,7 @@
#ifndef __KEYBOARD_H
#define __KEYBOARD_H
-void init_keyboard();
-void open_keyboard_window();
+void init_keyboard(void);
+void open_keyboard_window(void);
#endif /* __KEYBOARD_H */
diff --git a/src/gui/messagebox.h b/src/gui/messagebox.h
index eb20ce8..cf825b6 100644
--- a/src/gui/messagebox.h
+++ b/src/gui/messagebox.h
@@ -18,7 +18,7 @@
#ifndef __MESSAGEBOX_H
#define __MESSAGEBOX_H
-void init_messagebox();
+void init_messagebox(void);
void messagebox(const char *title, const char *text);
#endif /* __MESSAGEBOX_H */
diff --git a/src/gui/midi.c b/src/gui/midi.c
index 1a8281d..f5a0536 100644
--- a/src/gui/midi.c
+++ b/src/gui/midi.c
@@ -165,7 +165,7 @@ static int w_open;
static char midi_bindings[128][384];
-static void load_config()
+static void load_config(void)
{
char config_key[8];
int i;
@@ -188,7 +188,7 @@ static void load_config()
}
}
-static void set_config()
+static void set_config(void)
{
char config_key[16];
int i;
@@ -212,7 +212,7 @@ static void set_config()
config_write_int("midi_channel", mtk_req_i(appid, "e_channel.text"));
}
-static void update_list()
+static void update_list(void)
{
char str[32768];
char note[16];
@@ -294,7 +294,7 @@ static void midi_event(mtk_event *e, int count)
}
}
-static void close_window()
+static void close_window(void)
{
mtk_cmd(appid, "w.close()");
input_delete_callback(midi_event);
diff --git a/src/gui/midi.h b/src/gui/midi.h
index 0702011..b9f8718 100644
--- a/src/gui/midi.h
+++ b/src/gui/midi.h
@@ -18,7 +18,7 @@
#ifndef __MIDI_H
#define __MIDI_H
-void init_midi();
-void open_midi_window();
+void init_midi(void);
+void open_midi_window(void);
#endif /* __MIDI_H */
diff --git a/src/gui/monitor.h b/src/gui/monitor.h
index 9840d1e..7edc1ba 100644
--- a/src/gui/monitor.h
+++ b/src/gui/monitor.h
@@ -18,8 +18,8 @@
#ifndef __MONITOR_H
#define __MONITOR_H
-void init_monitor();
-void open_monitor_window();
-void monitor_notify_changed();
+void init_monitor(void);
+void open_monitor_window(void);
+void monitor_notify_changed(void);
#endif /* __MONITOR_H */
diff --git a/src/gui/oscsettings.c b/src/gui/oscsettings.c
index 35d6c96..edc0e17 100644
--- a/src/gui/oscsettings.c
+++ b/src/gui/oscsettings.c
@@ -41,7 +41,7 @@ static int w_open;
static char osc_bindings[64][384];
-static void load_config()
+static void load_config(void)
{
char config_key[7];
int i;
@@ -57,7 +57,7 @@ static void load_config()
}
}
-static void set_config()
+static void set_config(void)
{
char config_key[7];
int i;
@@ -71,7 +71,7 @@ static void set_config()
}
}
-static void update_list()
+static void update_list(void)
{
char str[32768];
char *p;
@@ -114,7 +114,7 @@ static void selchange_callback(mtk_event *e, void *arg)
}
}
-static void close_window()
+static void close_window(void)
{
mtk_cmd(appid, "w.close()");
w_open = 0;
diff --git a/src/gui/oscsettings.h b/src/gui/oscsettings.h
index 08150a6..8bb09b2 100644
--- a/src/gui/oscsettings.h
+++ b/src/gui/oscsettings.h
@@ -18,7 +18,7 @@
#ifndef __OSCSETTINGS_H
#define __OSCSETTINGS_H
-void init_oscsettings();
-void open_oscsettings_window();
+void init_oscsettings(void);
+void open_oscsettings_window(void);
#endif /* __OSCSETTINGS_H */
diff --git a/src/gui/patcheditor.c b/src/gui/patcheditor.c
index 7f232cc..0b730e0 100644
--- a/src/gui/patcheditor.c
+++ b/src/gui/patcheditor.c
@@ -38,7 +38,7 @@ static struct filedialog *filesave_dlg;
static int modified;
static char current_filename[384];
-static void update_wintitle()
+static void update_wintitle(void)
{
const char *short_filename;
@@ -96,7 +96,7 @@ static void openok_callback(void *arg)
mtk_cmd(appid, "edf.expose(0, 0)");
}
-static void save_current()
+static void save_current(void)
{
char buf[32768];
FILE *fd;
diff --git a/src/gui/patcheditor.h b/src/gui/patcheditor.h
index a9d7aa9..870d45f 100644
--- a/src/gui/patcheditor.h
+++ b/src/gui/patcheditor.h
@@ -18,7 +18,7 @@
#ifndef __PATCHEDITOR_H
#define __PATCHEDITOR_H
-void init_patcheditor();
-void open_patcheditor_window();
+void init_patcheditor(void);
+void open_patcheditor_window(void);
#endif /* __PATCHEDITOR_H */
diff --git a/src/gui/performance.c b/src/gui/performance.c
index da751d0..407bdb5 100644
--- a/src/gui/performance.c
+++ b/src/gui/performance.c
@@ -76,7 +76,7 @@ static int midi_channel;
static int midi_patches[128];
static int osc_patches[64];
-static void add_firstpatch()
+static void add_firstpatch(void)
{
const char *filename;
@@ -85,7 +85,7 @@ static void add_firstpatch()
add_patch(filename);
}
-static void add_keyboard_patches()
+static void add_keyboard_patches(void)
{
int i;
char config_key[6];
@@ -103,7 +103,7 @@ static void add_keyboard_patches()
}
}
-static void add_ir_patches()
+static void add_ir_patches(void)
{
int i;
char config_key[6];
@@ -119,7 +119,7 @@ static void add_ir_patches()
}
}
-static void add_midi_patches()
+static void add_midi_patches(void)
{
int i;
char config_key[8];
@@ -136,7 +136,7 @@ static void add_midi_patches()
}
}
-static void add_osc_patches()
+static void add_osc_patches(void)
{
int i;
char config_key[7];
@@ -152,7 +152,7 @@ static void add_osc_patches()
}
}
-static void add_simple_patches()
+static void add_simple_patches(void)
{
DIR *d;
struct dirent *entry;
@@ -185,7 +185,7 @@ static void close_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w.close()");
}
-static void update_buttons()
+static void update_buttons(void)
{
mtk_cmdf(appid, "b_mode_simple.set(-state %s)", simple_mode ? "on" :
"off");
mtk_cmdf(appid, "b_mode_file.set(-state %s)", !simple_mode ? "on" :
"off");
@@ -313,7 +313,7 @@ static rtems_task comp_task(rtems_task_argument argument)
rtems_task_delete(RTEMS_SELF);
}
-static void free_patches()
+static void free_patches(void)
{
int i;
@@ -360,7 +360,7 @@ static int keycode_to_index(int keycode)
static rtems_interval next_as_time;
#define AUTOSWITCH_PERIOD_MIN (2*60*100)
#define AUTOSWITCH_PERIOD_MAX (4*60*100)
-static void update_next_as_time()
+static void update_next_as_time(void)
{
rtems_interval t;
@@ -466,7 +466,7 @@ static void event_callback(mtk_event *e, int count)
}
}
-static void stop_callback()
+static void stop_callback(void)
{
free_patches();
started = 0;
@@ -530,7 +530,7 @@ void open_performance_window()
static rtems_id comp_task_id;
-static int check_input_video()
+static int check_input_video(void)
{
int fd;
unsigned int status;
diff --git a/src/gui/performance.h b/src/gui/performance.h
index 82e2a66..080c9fb 100644
--- a/src/gui/performance.h
+++ b/src/gui/performance.h
@@ -20,8 +20,8 @@
#define SIMPLE_PATCHES_FOLDER "/ssd/patchpool"
-void init_performance();
-void open_performance_window();
+void init_performance(void);
+void open_performance_window(void);
void start_performance(int simple, int dt, int as);
#endif /* __PERFORMANCE_H */
diff --git a/src/gui/rsswall.c b/src/gui/rsswall.c
index 9833d48..6518858 100644
--- a/src/gui/rsswall.c
+++ b/src/gui/rsswall.c
@@ -36,7 +36,7 @@ static int appid;
static int w_open;
static int rsswall_enable;
-static void load_config()
+static void load_config(void)
{
const char *url, *idle;
@@ -55,7 +55,7 @@ static void load_config()
mtk_cmdf(appid, "e_idlep.set(-text \"%d\")",
config_read_int("rss_idlep", 5));
}
-static void set_config()
+static void set_config(void)
{
char url[512];
char idle[512];
@@ -70,7 +70,7 @@ static void set_config()
config_write_int("rss_idlep", mtk_req_i(appid, "e_idlep.text"));
}
-static void close_window()
+static void close_window(void)
{
mtk_cmd(appid, "w.close()");
w_open = 0;
diff --git a/src/gui/rsswall.h b/src/gui/rsswall.h
index c9fb093..04a20a7 100644
--- a/src/gui/rsswall.h
+++ b/src/gui/rsswall.h
@@ -18,10 +18,10 @@
#ifndef __RSSWALL_H
#define __RSSWALL_H
-void init_rsswall();
-void open_rsswall_window();
+void init_rsswall(void);
+void open_rsswall_window(void);
-void rsswall_start();
-void rsswall_stop();
+void rsswall_start(void);
+void rsswall_stop(void);
#endif /* __RSSWALL_H */
diff --git a/src/gui/shutdown.h b/src/gui/shutdown.h
index e13766a..1c06283 100644
--- a/src/gui/shutdown.h
+++ b/src/gui/shutdown.h
@@ -18,8 +18,8 @@
#ifndef __SHUTDOWN_H
#define __SHUTDOWN_H
-void init_shutdown();
-void open_shutdown_window();
+void init_shutdown(void);
+void open_shutdown_window(void);
void clean_shutdown(int turnoff);
diff --git a/src/gui/sysettings.c b/src/gui/sysettings.c
index 7cd6121..0a783b1 100644
--- a/src/gui/sysettings.c
+++ b/src/gui/sysettings.c
@@ -30,10 +30,10 @@ static struct filedialog *browse_wallpaper_dlg;
static struct filedialog *browse_autostart_dlg;
static void close_sysettings_window(int save);
-static void update_language();
-static void update_layout();
-static void update_network();
-static void update_asmode();
+static void update_language(void);
+static void update_layout(void);
+static void update_network(void);
+static void update_asmode(void);
static void resolution_callback(mtk_event *e, void *arg)
{
@@ -104,7 +104,7 @@ static void cancel_callback(mtk_event *e, void *arg)
close_sysettings_window(0);
}
-static void wallpaper_ok_callback()
+static void wallpaper_ok_callback(void *arg)
{
char filename[384];
@@ -112,7 +112,7 @@ static void wallpaper_ok_callback()
mtk_cmdf(appid, "e_wallpaper.set(-text \"%s\")", filename);
}
-static void autostart_ok_callback()
+static void autostart_ok_callback(void *arg)
{
char filename[384];
@@ -343,7 +343,7 @@ void sysettings_update_resolution()
mtk_cmdf(appid, "b_res_1024.set(-state %s)", resolution ==
SC_RESOLUTION_1024_768 ? "on" : "off");
}
-static void update_wallpaper()
+static void update_wallpaper(void)
{
char wallpaper[256];
@@ -351,7 +351,7 @@ static void update_wallpaper()
mtk_cmdf(appid, "e_wallpaper.set(-text \"%s\")", wallpaper);
}
-static void update_language()
+static void update_language(void)
{
int language;
@@ -362,7 +362,7 @@ static void update_language()
//mtk_cmdf(appid, "b_lang_german.set(-state %s)", language ==
SC_LANGUAGE_GERMAN ? "on" : "off");
}
-static void update_layout()
+static void update_layout(void)
{
int layout;
@@ -425,7 +425,7 @@ static void update_network()
mtk_cmdf(appid, "e_dns.set(-readonly %s)", dhcp_enable ? "yes" : "no");
}
-static void update_credentials()
+static void update_credentials(void)
{
char login[32];
char password[32];
@@ -435,7 +435,7 @@ static void update_credentials()
mtk_cmdf(appid, "e_password.set(-text \"%s\")", password);
}
-static void update_asmode()
+static void update_asmode(void)
{
mtk_cmdf(appid, "b_asmode_none.set(-state %s)", current_asmode ==
SC_AUTOSTART_NONE ? "on" : "off");
mtk_cmdf(appid, "b_asmode_simple.set(-state %s)", current_asmode ==
SC_AUTOSTART_SIMPLE ? "on" : "off");
@@ -444,7 +444,7 @@ static void update_asmode()
mtk_cmdf(appid, "b_asmode_as.set(-state %s)", current_asmode_as ? "on"
: "off");
}
-static void update_autostart()
+static void update_autostart(void)
{
char autostart[256];
diff --git a/src/gui/sysettings.h b/src/gui/sysettings.h
index 657b6ad..13a95ef 100644
--- a/src/gui/sysettings.h
+++ b/src/gui/sysettings.h
@@ -18,8 +18,8 @@
#ifndef __SYSETTINGS_H
#define __SYSETTINGS_H
-void init_sysettings();
-void open_sysettings_window();
-void sysettings_update_resolution();
+void init_sysettings(void);
+void open_sysettings_window(void);
+void sysettings_update_resolution(void);
#endif /* __SYSETTINGS_H */
diff --git a/src/gui/videoin.c b/src/gui/videoin.c
index 299b4cd..cb7297f 100644
--- a/src/gui/videoin.c
+++ b/src/gui/videoin.c
@@ -127,7 +127,7 @@ void load_videoin_config()
mtk_cmdf(appid, "s_hue.set(-value %d)", hue);
}
-static void set_config()
+static void set_config(void)
{
config_write_int("vin_format", format);
config_write_int("vin_brightness", brightness);
@@ -183,7 +183,7 @@ static void preview_update(mtk_event *e, int count)
}
}
-static void close_videoin_window()
+static void close_videoin_window(void)
{
input_delete_callback(preview_update);
mtk_cmd(appid, "w.close()");
diff --git a/src/gui/videoin.h b/src/gui/videoin.h
index 61f6501..a214632 100644
--- a/src/gui/videoin.h
+++ b/src/gui/videoin.h
@@ -18,8 +18,8 @@
#ifndef __VIDEOIN_H
#define __VIDEOIN_H
-void init_videoin();
-void open_videoin_window();
-void load_videoin_config();
+void init_videoin(void);
+void open_videoin_window(void);
+void load_videoin_config(void);
#endif /* __VIDEOIN_H */
diff --git a/src/input.c b/src/input.c
index 2b6538e..63d8a94 100644
--- a/src/input.c
+++ b/src/input.c
@@ -327,7 +327,7 @@ static void start_event_task(const char *dev, rtems_name
name, int *fd)
static input_callback callbacks[MAX_CALLBACKS];
-void init_input(input_callback cb)
+void init_input(void)
{
rtems_status_code sc;
int i;
diff --git a/src/input.h b/src/input.h
index 302c83d..f85830e 100644
--- a/src/input.h
+++ b/src/input.h
@@ -29,10 +29,10 @@
typedef void (*input_callback)(mtk_event *e, int count);
-void init_input();
+void init_input(void);
void input_add_callback(input_callback cb);
void input_delete_callback(input_callback cb);
-void input_eventloop();
+void input_eventloop(void);
void input_inject_midi(const unsigned char *msg);
void input_inject_osc(unsigned char msg);
diff --git a/src/osc.h b/src/osc.h
index 49e9c95..3b93fa2 100644
--- a/src/osc.h
+++ b/src/osc.h
@@ -18,7 +18,7 @@
#ifndef __OSC_H
#define __OSC_H
-void init_osc();
+void init_osc(void);
void get_osc_variables(float *out);
#endif /* __OSC_H */
diff --git a/src/shortcuts.c b/src/shortcuts.c
index 0c34cec..3c5a0c7 100644
--- a/src/shortcuts.c
+++ b/src/shortcuts.c
@@ -36,7 +36,7 @@ static rtems_interval f9_press_time;
static int f10_pressed;
static rtems_interval f10_press_time;
-static void switch_resolution()
+static void switch_resolution(void)
{
int res;
@@ -102,7 +102,7 @@ static void shortcuts_callback(mtk_event *e, int count)
}
}
-void init_shortcuts()
+void init_shortcuts(void)
{
input_add_callback(shortcuts_callback);
}
diff --git a/src/shortcuts.h b/src/shortcuts.h
index e467ac6..89e09aa 100644
--- a/src/shortcuts.h
+++ b/src/shortcuts.h
@@ -18,6 +18,6 @@
#ifndef __SHORTCUTS_H
#define __SHORTCUTS_H
-void init_shortcuts();
+void init_shortcuts(void);
#endif /* __SHORTCUTS_H */
diff --git a/src/sysconfig.c b/src/sysconfig.c
index 64df08e..ba7f664 100644
--- a/src/sysconfig.c
+++ b/src/sysconfig.c
@@ -162,9 +162,9 @@ static void format_ip(unsigned int ip, char *out)
#define SYSCONFIG_FILE "/ssd/sysconfig.bin"
-static void sysconfig_credentials_lock_init();
-static void sysconfig_credentials_lock();
-static void sysconfig_credentials_unlock();
+static void sysconfig_credentials_lock_init(void);
+static void sysconfig_credentials_lock(void);
+static void sysconfig_credentials_unlock(void);
int sysconfig_is_rescue()
{
@@ -176,7 +176,7 @@ int sysconfig_is_rescue()
return strcmp(bsp_cmdline, "rescue") == 0;
}
-static void start_dhcp_task();
+static void start_dhcp_task(void);
void sysconfig_load()
{
@@ -274,7 +274,7 @@ static int retrieve_gateway(struct radix_node *rn, void *vw)
return 0;
}
-static unsigned int route_get_gateway()
+static unsigned int route_get_gateway(void)
{
struct radix_node_head *rnh;
int error;
@@ -474,7 +474,7 @@ static rtems_task dhcp_task(rtems_task_argument argument)
rtems_task_delete(RTEMS_SELF);
}
-static void start_dhcp_task()
+static void start_dhcp_task(void)
{
rtems_id task_id;
rtems_status_code sc;
@@ -578,7 +578,7 @@ bool sysconfig_login_check(const char *user, const char
*passphrase)
static rtems_id credentials_lock;
-static void sysconfig_credentials_lock_init()
+static void sysconfig_credentials_lock_init(void)
{
rtems_semaphore_create(
rtems_build_name('C', 'R', 'E', 'D'),
@@ -588,12 +588,12 @@ static void sysconfig_credentials_lock_init()
&credentials_lock);
}
-static void sysconfig_credentials_lock()
+static void sysconfig_credentials_lock(void)
{
rtems_semaphore_obtain(credentials_lock, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
}
-static void sysconfig_credentials_unlock()
+static void sysconfig_credentials_unlock(void)
{
rtems_semaphore_release(credentials_lock);
}
diff --git a/src/sysconfig.h b/src/sysconfig.h
index 9b86ea0..2802fc4 100644
--- a/src/sysconfig.h
+++ b/src/sysconfig.h
@@ -44,26 +44,26 @@ enum {
SC_AUTOSTART_FILE
};
-int sysconfig_is_rescue();
+int sysconfig_is_rescue(void);
-void sysconfig_load();
-void sysconfig_save();
+void sysconfig_load(void);
+void sysconfig_save(void);
-int sysconfig_get_resolution();
+int sysconfig_get_resolution(void);
void sysconfig_get_wallpaper(char *wallpaper);
-int sysconfig_get_language();
-int sysconfig_get_keyboard_layout();
+int sysconfig_get_language(void);
+int sysconfig_get_keyboard_layout(void);
void sysconfig_get_ipconfig(int *dhcp_enable, unsigned int *ip, unsigned int
*netmask, unsigned int *gateway, unsigned int *dns1, unsigned int *dns2);
void sysconfig_get_credentials(char *login, char *password);
-int sysconfig_get_autostart_mode();
+int sysconfig_get_autostart_mode(void);
void sysconfig_get_autostart_mode_simple(int *dt, int *as);
void sysconfig_get_autostart(char *autostart);
void sysconfig_set_resolution(int resolution);
void sysconfig_set_wallpaper(char *wallpaper);
-void sysconfig_set_mtk_wallpaper();
+void sysconfig_set_mtk_wallpaper(void);
void sysconfig_set_language(int language);
-void sysconfig_set_mtk_language();
+void sysconfig_set_mtk_language(void);
void sysconfig_set_keyboard_layout(int layout);
void sysconfig_set_ipconfig(int dhcp_enable, unsigned int ip, unsigned int
netmask, unsigned int gateway, unsigned int dns1, unsigned int dns2);
void sysconfig_set_credentials(char *login, char *password);
diff --git a/src/version.c b/src/version.c
index e278b90..44824ff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -42,7 +42,7 @@ static void read_dev(const char *dev, char *buf, unsigned int
len)
close(fd);
}
-void init_version()
+void init_version(void)
{
read_dev("/dev/soc", soc, sizeof(soc));
read_dev("/dev/pcb", pcb, sizeof(pcb));
diff --git a/src/version.h b/src/version.h
index 0056c6a..6bb0283 100644
--- a/src/version.h
+++ b/src/version.h
@@ -24,6 +24,6 @@ extern char soc[];
extern char pcb[];
extern char pcb_rev[];
-void init_version();
+void init_version(void);
#endif /* __VERSION_H */
--
1.7.1
_______________________________________________
http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org
IRC: #milkymist@Freenode
