Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: m-labs/flickernoise
base: d463e17
...
head fork: m-labs/flickernoise
compare: 7a57cc5
  • 5 commits
  • 67 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 12, 2011
@wpwrak wpwrak flickernoise: use -Wstrict-prototypes
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.
5d8e839
@wpwrak wpwrak flickernoise: use -Wmissing-prototypes
Again, with the cleanup that comes from it.
8d7d53d
@wpwrak wpwrak flickernoise: use -Wold-style-declaration
We just had one case of "static" not being the first item, in
bandfilters.h. Updated the script generating it and then re-generated
the file.
911ca23
@wpwrak wpwrak flickernoise: use -Wold-style-definition
This one catches all the old-style definitions with ANSI-conformant
declarations, e.g.,

int foo(void);

...

int foo()
{
	...
}

Due to -Wstrict-prototypes and -Wmissing-prototypes, we're already
reasonably sure that this can't cause trouble. But better safe than
sorry.
98e96e7
@wpwrak wpwrak flickernoise: improve quiet mode of Makefile
This patch restructures the verbosity control to make it more
readable and then adds $(GEN), of any remaining type of file
generation.
7a57cc5
Showing with 261 additions and 247 deletions.
  1. +30 −23 src/Makefile
  2. +1 −1  src/config.c
  3. +1 −1  src/config.h
  4. +5 −5 src/fb.c
  5. +5 −5 src/fb.h
  6. +1 −1  src/fbgrab.c
  7. +2 −2 src/gui/about.c
  8. +2 −2 src/gui/about.h
  9. +4 −4 src/gui/audio.c
  10. +3 −3 src/gui/audio.h
  11. +5 −5 src/gui/cp.c
  12. +3 −3 src/gui/cp.h
  13. +4 −4 src/gui/dmx.c
  14. +3 −3 src/gui/dmx.h
  15. +3 −3 src/gui/dmxdesk.c
  16. +3 −3 src/gui/dmxdesk.h
  17. +3 −3 src/gui/dmxspy.c
  18. +3 −3 src/gui/dmxspy.h
  19. +2 −2 src/gui/filemanager.c
  20. +2 −2 src/gui/filemanager.h
  21. +2 −2 src/gui/firstpatch.c
  22. +2 −2 src/gui/firstpatch.h
  23. +8 −8 src/gui/flash.c
  24. +1 −1  src/gui/flash.h
  25. +1 −1  src/gui/guirender.c
  26. +2 −2 src/gui/guirender.h
  27. +6 −6 src/gui/ir.c
  28. +2 −2 src/gui/ir.h
  29. +6 −6 src/gui/keyboard.c
  30. +2 −2 src/gui/keyboard.h
  31. +1 −1  src/gui/messagebox.c
  32. +1 −1  src/gui/messagebox.h
  33. +6 −6 src/gui/midi.c
  34. +2 −2 src/gui/midi.h
  35. +3 −3 src/gui/monitor.c
  36. +3 −3 src/gui/monitor.h
  37. +6 −6 src/gui/oscsettings.c
  38. +2 −2 src/gui/oscsettings.h
  39. +4 −4 src/gui/patcheditor.c
  40. +2 −2 src/gui/patcheditor.h
  41. +13 −13 src/gui/performance.c
  42. +2 −2 src/gui/performance.h
  43. +7 −7 src/gui/rsswall.c
  44. +4 −4 src/gui/rsswall.h
  45. +2 −2 src/gui/shutdown.c
  46. +2 −2 src/gui/shutdown.h
  47. +16 −16 src/gui/sysettings.c
  48. +3 −3 src/gui/sysettings.h
  49. +5 −5 src/gui/videoin.c
  50. +3 −3 src/gui/videoin.h
  51. +2 −2 src/input.c
  52. +2 −2 src/input.h
  53. +2 −0  src/main.c
  54. +1 −1  src/osc.c
  55. +1 −1  src/osc.h
  56. +2 −1  src/pixbuf/dither.c
  57. +1 −1  src/pixbuf/pixbuf.h
  58. +1 −0  src/pngwrite.c
  59. +3 −3 src/renderer/bandfilters.h
  60. +3 −3 src/renderer/bandfilters.sce
  61. +4 −4 src/shellext.c
  62. +3 −2 src/shortcuts.c
  63. +1 −1  src/shortcuts.h
  64. +18 −18 src/sysconfig.c
  65. +9 −9 src/sysconfig.h
  66. +3 −1 src/version.c
  67. +1 −1  src/version.h
View
53 src/Makefile
@@ -4,30 +4,37 @@ RTEMS_MAKEFILE_PATH ?= \
WITH_PDF ?= 0
CROSS_COMPILER=lm32-rtems$(RTEMS_VERSION)-
-CC_normal := $(CROSS_COMPILER)gcc
-LD_normal := $(CROSS_COMPILER)gcc
-OBJCOPY_normal := $(CROSS_COMPILER)objcopy
-CC_quiet = @echo " CC " $@ && $(CROSS_COMPILER)gcc
-LD_quiet = @echo " LD " $@ && $(CROSS_COMPILER)gcc
-OBJCOPY_quiet = @echo " OBJCOPY " $@ && $(CROSS_COMPILER)objcopy
+
+CC_normal := $(CROSS_COMPILER)gcc
+LD_normal := $(CROSS_COMPILER)gcc
+OBJCOPY_normal := $(CROSS_COMPILER)objcopy
+
+CC_quiet = @echo " CC " $@ && $(CROSS_COMPILER)gcc
+LD_quiet = @echo " LD " $@ && $(CROSS_COMPILER)gcc
+OBJCOPY_quiet = @echo " OBJCOPY " $@ && $(CROSS_COMPILER)objcopy
+GEN_quiet = @echo " GENERATE " $@ &&
ifeq ($(V),1)
- CC = $(CC_normal)
- AR = $(AR_normal)
- AS = $(AS_normal)
- LD = $(LD_normal)
- OBJCOPY = $(OBJCOPY_normal)
- RANLIB = $(RANLIB_normal)
+ CC = $(CC_normal)
+ AR = $(AR_normal)
+ AS = $(AS_normal)
+ LD = $(LD_normal)
+ OBJCOPY = $(OBJCOPY_normal)
+ RANLIB = $(RANLIB_normal)
+ GEN =
else
- CC = $(CC_quiet)
- AR = $(AR_quiet)
- AS = $(AS_quiet)
- LD = $(LD_quiet)
- OBJCOPY = $(OBJCOPY_quiet)
- RANLIB = $(RANLIB_quiet)
+ CC = $(CC_quiet)
+ AR = $(AR_quiet)
+ AS = $(AS_quiet)
+ LD = $(LD_quiet)
+ OBJCOPY = $(OBJCOPY_quiet)
+ RANLIB = $(RANLIB_quiet)
+ GEN = $(GEN_quiet)
endif
-CFLAGS = -O9 -Wall -mbarrel-shift-enabled -mmultiply-enabled \
+CFLAGS = -O9 -Wall -Wstrict-prototypes -Wmissing-prototypes \
+ -Wold-style-declaration -Wold-style-definition \
+ -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 \
@@ -77,17 +84,17 @@ bandfilters.h: bandfilters.sce
scilab -nw -nwni -nogui -nb -f bandfilters.sce
%.c: %.re
- re2c -c -o $@ $<
+ $(GEN) re2c -c -o $@ $<
%.c: %.y
- lemon $<
+ $(GEN) lemon $<
%.h %.inc: %.ids
- cd compiler && ./idgen `basename $<`
+ $(GEN) cd compiler && ./idgen `basename $<`
compiler/infra-fnp.h: \
compiler/finish-pfv.fnp compiler/init-pvv.fnp compiler/finish-pvv.fnp
- compiler/file2h $^ >$@ || { rm -f $@; }
+ $(GEN) compiler/file2h $^ >$@ || { rm -f $@; }
compiler/parser.h: compiler/parser.c
obj/compiler/scanner.o: compiler/parser.h
View
2  src/config.c
@@ -146,7 +146,7 @@ void config_delete(const char *key)
free(e);
}
-void config_free()
+void config_free(void)
{
struct element *e, *next;
View
2  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);
View
10 src/fb.c
@@ -90,7 +90,7 @@ void init_fb_mtk(int quiet)
}
}
-void fb_unblank()
+void fb_unblank(void)
{
if(blanked) {
set_mode(sysconfig_get_resolution());
@@ -101,7 +101,7 @@ void fb_unblank()
}
}
-void fb_render_mode()
+void fb_render_mode(void)
{
set_mode(SC_RESOLUTION_640_480);
ioctl(framebuffer_fd, FBIOSETBUFFERMODE, FB_TRIPLE_BUFFERED);
@@ -109,7 +109,7 @@ void fb_render_mode()
g_render_mode = 1;
}
-void fb_gui_mode()
+void fb_gui_mode(void)
{
set_mode(sysconfig_get_resolution());
ioctl(framebuffer_fd, FBIOSETBUFFERMODE, FB_SINGLE_BUFFERED);
@@ -117,12 +117,12 @@ void fb_gui_mode()
g_render_mode = 0;
}
-int fb_get_mode()
+int fb_get_mode(void)
{
return g_render_mode;
}
-void fb_resize_gui()
+void fb_resize_gui(void)
{
struct fb_fix_screeninfo fb_fix;
int mode, hres, vres;
View
10 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 */
View
2  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;
View
4 src/gui/about.c
@@ -37,7 +37,7 @@ static void flash_callback(mtk_event *e, void *arg)
#define FLASH_OFFSET_MAC_ADDRESS (0x002200E0)
-void init_about()
+void init_about(void)
{
unsigned char *macadr = (unsigned char *)FLASH_OFFSET_MAC_ADDRESS;
@@ -93,7 +93,7 @@ void init_about()
mtk_bind(appid, "w", "close", close_callback, NULL);
}
-void open_about_window()
+void open_about_window(void)
{
mtk_cmd(appid, "w.open()");
}
View
4 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 */
View
8 src/gui/audio.c
@@ -87,7 +87,7 @@ static void mute_callback(mtk_event *e, void *arg)
}
}
-void load_audio_config()
+void load_audio_config(void)
{
line_vol = config_read_int("line_vol", 100);
line_mute = config_read_int("line_mute", 0);
@@ -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);
@@ -134,7 +134,7 @@ static void close_callback(mtk_event *e, void *arg)
load_audio_config();
}
-void init_audio()
+void init_audio(void)
{
appid = mtk_init_app("Audio");
@@ -193,7 +193,7 @@ void init_audio()
load_audio_config();
}
-void open_audio_window()
+void open_audio_window(void)
{
if(w_open) return;
w_open = 1;
View
6 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 */
View
10 src/gui/cp.c
@@ -54,20 +54,20 @@ static struct filedialog *save_dlg;
static int changed;
-void cp_notify_changed()
+void cp_notify_changed(void)
{
if(changed) return;
changed = 1;
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();
@@ -207,7 +207,7 @@ static void cp_callback(mtk_event *e, void *arg)
}
}
-void init_cp()
+void init_cp(void)
{
appid = mtk_init_app("Control panel");
@@ -363,7 +363,7 @@ void init_cp()
save_dlg = create_filedialog("Save performance", 1, "per", saveok_callback, NULL, NULL, NULL);
}
-void cp_autostart()
+void cp_autostart(void)
{
char autostart[256];
int dt, as;
View
6 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 */
View
8 src/gui/dmx.c
@@ -64,7 +64,7 @@ static void set_chain_mode(int chain)
resmgr_release(RESOURCE_DMX_OUT);
}
-void load_dmx_config()
+void load_dmx_config(void)
{
int i, value;
char confname[12];
@@ -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];
@@ -142,7 +142,7 @@ static void close_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w.close()");
}
-void init_dmx()
+void init_dmx(void)
{
int i;
@@ -212,7 +212,7 @@ void init_dmx()
set_chain_mode(1);
}
-void open_dmx_window()
+void open_dmx_window(void)
{
if(w_open) return;
w_open = 1;
View
6 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 */
View
6 src/gui/dmxdesk.c
@@ -82,7 +82,7 @@ static void close_callback(mtk_event *e, void *arg)
close_dmxdesk_window();
}
-void init_dmxdesk()
+void init_dmxdesk(void)
{
int i;
@@ -115,7 +115,7 @@ void init_dmxdesk()
static int w_open;
-void open_dmxdesk_window()
+void open_dmxdesk_window(void)
{
if(w_open) return;
w_open = 1;
@@ -131,7 +131,7 @@ void open_dmxdesk_window()
mtk_cmd(appid, "w.open()");
}
-void close_dmxdesk_window()
+void close_dmxdesk_window(void)
{
if(!w_open) return;
w_open = 0;
View
6 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 */
View
6 src/gui/dmxspy.c
@@ -76,7 +76,7 @@ static void close_callback(mtk_event *e, void *arg)
close_dmxspy_window();
}
-void init_dmxspy()
+void init_dmxspy(void)
{
appid = mtk_init_app("DMX spy");
@@ -100,7 +100,7 @@ void init_dmxspy()
}
-void open_dmxspy_window()
+void open_dmxspy_window(void)
{
if(w_open) return;
if(!resmgr_acquire("DMX spy", RESOURCE_DMX_IN)) return;
@@ -117,7 +117,7 @@ void open_dmxspy_window()
input_add_callback(dmxspy_update);
}
-void close_dmxspy_window()
+void close_dmxspy_window(void)
{
mtk_cmd(appid, "w.close()");
input_delete_callback(dmxspy_update);
View
6 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 */
View
4 src/gui/filemanager.c
@@ -286,7 +286,7 @@ static void unlock_callback(mtk_event *e, void *arg)
unlock++;
}
-void init_filemanager()
+void init_filemanager(void)
{
appid = mtk_init_app("File manager");
@@ -466,7 +466,7 @@ static void display_folder(int panel, const char *folder)
mtk_cmdf(appid, "p%d_listf.expose(0, 0)", panel);
}
-void open_filemanager_window()
+void open_filemanager_window(void)
{
unlock = 0;
display_folder(0, ROOT_FOLDER);
View
4 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 */
View
4 src/gui/firstpatch.c
@@ -62,7 +62,7 @@ static void browse_ok_callback(void *arg)
mtk_cmdf(appid, "e_filename.set(-text \"%s\")", filename);
}
-void init_firstpatch()
+void init_firstpatch(void)
{
appid = mtk_init_app("First patch");
@@ -102,7 +102,7 @@ void init_firstpatch()
browse_dlg = create_filedialog("Select first patch", 0, "fnp", browse_ok_callback, NULL, NULL, NULL);
}
-void open_firstpatch_window()
+void open_firstpatch_window(void)
{
const char *firstpatch;
View
4 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 */
View
16 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];
@@ -761,7 +761,7 @@ static void opendialog_callback(mtk_event *e, void *arg)
open_filedialog(file_dlg);
}
-void init_flash()
+void init_flash(void)
{
appid = mtk_init_app("Flash");
View
2  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 */
View
2  src/gui/guirender.c
@@ -53,7 +53,7 @@ static void input_cb(mtk_event *e, int count);
static int guirender_running;
static guirender_stop_callback callback;
-void guirender_stop()
+void guirender_stop(void)
{
if(!guirender_running) return;
guirender_running = 0;
View
4 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 */
View
12 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);
@@ -261,7 +261,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_ir()
+void init_ir(void)
{
appid = mtk_init_app("IR remote control settings");
@@ -340,7 +340,7 @@ void init_ir()
browse_dlg = create_filedialog("Select IR patch", 0, "fnp", browse_ok_callback, NULL, NULL, NULL);
}
-void open_ir_window()
+void open_ir_window(void)
{
if(w_open) return;
w_open = 1;
View
4 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 */
View
12 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];
@@ -243,7 +243,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_keyboard()
+void init_keyboard(void)
{
appid = mtk_init_app("Keyboard");
@@ -322,7 +322,7 @@ void init_keyboard()
browse_dlg = create_filedialog("Select keyboard patch", 0, "fnp", browse_ok_callback, NULL, NULL, NULL);
}
-void open_keyboard_window()
+void open_keyboard_window(void)
{
if(w_open) return;
w_open = 1;
View
4 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 */
View
2  src/gui/messagebox.c
@@ -28,7 +28,7 @@ static void close_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w.close()");
}
-void init_messagebox()
+void init_messagebox(void)
{
appid = mtk_init_app("Messagebox");
mtk_cmd_seq(appid,
View
2  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 */
View
12 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);
@@ -434,7 +434,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_midi()
+void init_midi(void)
{
int i;
@@ -571,7 +571,7 @@ void init_midi()
browse_dlg = create_filedialog("Select MIDI patch", 0, "fnp", browse_ok_callback, NULL, NULL, NULL);
}
-void open_midi_window()
+void open_midi_window(void)
{
if(w_open) return;
w_open = 1;
View
4 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 */
View
6 src/gui/monitor.c
@@ -134,7 +134,7 @@ static void close_callback(mtk_event *e, void *arg)
w_open = 0;
}
-void init_monitor()
+void init_monitor(void)
{
int i;
int column;
@@ -167,7 +167,7 @@ void init_monitor()
mtk_bind(appid, "w", "close", close_callback, NULL);
}
-void open_monitor_window()
+void open_monitor_window(void)
{
if(w_open) return;
@@ -186,7 +186,7 @@ void open_monitor_window()
sampler_start(sampler_callback);
}
-void monitor_notify_changed()
+void monitor_notify_changed(void)
{
if(!w_open) return;
sampler_stop();
View
6 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 */
View
12 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;
@@ -246,7 +246,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_oscsettings()
+void init_oscsettings(void)
{
appid = mtk_init_app("OSC");
@@ -323,7 +323,7 @@ void init_oscsettings()
browse_dlg = create_filedialog("OSC patch select", 0, "fnp", browse_ok_callback, NULL, NULL, NULL);
}
-void open_oscsettings_window()
+void open_oscsettings_window(void)
{
if(w_open) return;
w_open = 1;
View
4 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 */
View
8 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;
@@ -185,7 +185,7 @@ static void accel_callback(mtk_event *e, void *arg)
static void close_callback(mtk_event *e, void *arg);
-void init_patcheditor()
+void init_patcheditor(void)
{
appid = mtk_init_app("Patch editor");
mtk_cmd_seq(appid,
@@ -239,7 +239,7 @@ static void close_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w.close()");
}
-void open_patcheditor_window()
+void open_patcheditor_window(void)
{
if(w_open) return;
w_open = 1;
View
4 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 */
View
26 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");
@@ -222,7 +222,7 @@ static void go_callback(mtk_event *e, void *arg)
start_performance(simple_mode, dt_mode, as_mode);
}
-void init_performance()
+void init_performance(void)
{
appid = mtk_init_app("Performance");
@@ -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;
@@ -522,7 +522,7 @@ static void refresh_callback(mtk_event *e, int count)
}
}
-void open_performance_window()
+void open_performance_window(void)
{
update_buttons();
mtk_cmd(appid, "w.open()");
@@ -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;
View
4 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 */
View
14 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;
@@ -104,7 +104,7 @@ static void clearidle_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "e_idle.set(-text \"\")");
}
-void init_rsswall()
+void init_rsswall(void)
{
appid = mtk_init_app("RSS wall");
@@ -168,7 +168,7 @@ void init_rsswall()
mtk_bind(appid, "w", "close", cancel_callback, NULL);
}
-void open_rsswall_window()
+void open_rsswall_window(void)
{
if(w_open) return;
w_open = 1;
@@ -335,7 +335,7 @@ static rtems_task rsswall_task(rtems_task_argument argument)
rtems_task_delete(RTEMS_SELF);
}
-void rsswall_start()
+void rsswall_start(void)
{
rtems_status_code sc;
@@ -369,7 +369,7 @@ void rsswall_start()
rsswall_running = 1;
}
-void rsswall_stop()
+void rsswall_stop(void)
{
if(!rsswall_running) return;
rtems_event_send(rsswall_task_id, RTEMS_EVENT_1);
View
8 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 */
View
4 src/gui/shutdown.c
@@ -44,7 +44,7 @@ static void shutdown_callback(mtk_event *e, void *arg)
clean_shutdown(turnoff);
}
-void init_shutdown()
+void init_shutdown(void)
{
appid = mtk_init_app("Shutdown");
mtk_cmd_seq(appid,
@@ -67,7 +67,7 @@ void init_shutdown()
mtk_bind(appid, "w", "close", cancel_callback, NULL);
}
-void open_shutdown_window()
+void open_shutdown_window(void)
{
mtk_cmd(appid, "w.open()");
}
View
4 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);
View
32 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];
@@ -135,7 +135,7 @@ static void clear_wallpaper_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "e_wallpaper.set(-text \"\")");
}
-void init_sysettings()
+void init_sysettings(void)
{
appid = mtk_init_app("System settings");
@@ -332,7 +332,7 @@ void init_sysettings()
browse_autostart_dlg = create_filedialog("Select autostart performance", 0, "per", autostart_ok_callback, NULL, NULL, NULL);
}
-void sysettings_update_resolution()
+void sysettings_update_resolution(void)
{
int resolution;
@@ -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;
@@ -373,7 +373,7 @@ static void update_layout()
mtk_cmdf(appid, "b_kbd_german.set(-state %s)", layout == SC_KEYBOARD_LAYOUT_GERMAN ? "on" : "off");
}
-static void update_network()
+static void update_network(void)
{
int dhcp_enable;
unsigned int ip;
@@ -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];
@@ -477,7 +477,7 @@ static int previous_layout;
static int previous_dhcp;
static unsigned int previous_ip, previous_netmask, previous_gateway, previous_dns1, previous_dns2;
-void open_sysettings_window()
+void open_sysettings_window(void)
{
if(w_open) return;
w_open = 1;
View
6 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 */
View
10 src/gui/videoin.c
@@ -114,7 +114,7 @@ static void format_callback(mtk_event *e, void *arg)
set_format((int)arg);
}
-void load_videoin_config()
+void load_videoin_config(void)
{
set_format(config_read_int("vin_format", VIDEO_FORMAT_CVBS6));
@@ -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()");
@@ -204,7 +204,7 @@ static void close_callback(mtk_event *e, void *arg)
close_videoin_window();
}
-void init_videoin()
+void init_videoin(void)
{
appid = mtk_init_app("Video in");
@@ -308,7 +308,7 @@ void init_videoin()
mtk_bind(appid, "w", "close", close_callback, NULL);
}
-void open_videoin_window()
+void open_videoin_window(void)
{
if(w_open) return;
View
6 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 */
View
4 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;
@@ -373,7 +373,7 @@ void input_delete_callback(input_callback cb)
/* The maximum number of mtk_events that can be generated out of a single message on input_q */
#define WORST_CASE_EVENTS 20
-void input_eventloop()
+void input_eventloop(void)
{
mtk_event e[MAX_EVENTS];
int total, n;
View
4 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);
View
2  src/main.c
@@ -153,6 +153,8 @@ static rtems_id gui_task_id;
mount("/dev/memcard1", "/memcard", "dosfs", RTEMS_FILESYSTEM_READ_ONLY, "");
}*/
+rtems_task Init(rtems_task_argument argument);
+
rtems_task Init(rtems_task_argument argument)
{
rtems_status_code sc;
View
2  src/osc.c
@@ -160,7 +160,7 @@ static rtems_task osc_task(rtems_task_argument argument)
static rtems_id osc_task_id;
-void init_osc()
+void init_osc(void)
{
rtems_status_code sc;
View
2  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 */
View
3  src/pixbuf/dither.c
@@ -18,6 +18,7 @@
#include <stdlib.h>
#include "../color.h"
+#include "dither.h"
static void floyd_steinberg(int *pic, int width, int height)
{
@@ -128,4 +129,4 @@ int pixbuf_dither(unsigned short *ret, unsigned char **row_pointers, int width,
free(pic);
return 1;
-}
+}
View
2  src/pixbuf/pixbuf.h
@@ -33,4 +33,4 @@ void pixbuf_dec_ref(struct pixbuf *p);
struct pixbuf *pixbuf_get(char *filename);
-#endif /* __PIXBUF_PIXBUF_H */
+#endif /* __PIXBUF_PIXBUF_H */
View
1  src/pngwrite.c
@@ -23,6 +23,7 @@
#include "color.h"
#include "png.h"
+#include "pngwrite.h"
#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
#warning Floating point PNG is slow
View
6 src/renderer/bandfilters.h
@@ -1,6 +1,6 @@
/* Generated automatically by bandfilters.sce. Do not edit manually. */
-const static int bass_filter[128] = {
+static const int bass_filter[128] = {
155,
157,
158,
@@ -131,7 +131,7 @@ const static int bass_filter[128] = {
155,
};
-const static int mid_filter[128] = {
+static const int mid_filter[128] = {
-313,
-320,
-326,
@@ -262,7 +262,7 @@ const static int mid_filter[128] = {
-313,
};
-const static int treb_filter[128] = {
+static const int treb_filter[128] = {
17,
0,
2,
View
6 src/renderer/bandfilters.sce
@@ -13,21 +13,21 @@ end
mfprintf(fid, "/* Generated automatically by bandfilters.sce. Do not edit manually. */\n\n");
-mfprintf(fid, "const static int bass_filter[%d] = {\n", ncoef);
+mfprintf(fid, "static const int bass_filter[%d] = {\n", ncoef);
bass = ffilt("lp", ncoef, f1);
for i=1:ncoef
mfprintf(fid, "%d,\n", amp*bass(i));
end
mfprintf(fid, "};\n\n");
-mfprintf(fid, "const static int mid_filter[%d] = {\n", ncoef);
+mfprintf(fid, "static const int mid_filter[%d] = {\n", ncoef);
mid = ffilt("bp", ncoef, f1, f2);
for i=1:ncoef
mfprintf(fid, "%d,\n", amp*mid(i));
end
mfprintf(fid, "};\n\n");
-mfprintf(fid, "const static int treb_filter[%d] = {\n", ncoef);
+mfprintf(fid, "static const int treb_filter[%d] = {\n", ncoef);
treb = ffilt("bp", ncoef, f2, f3);
for i=1:ncoef
mfprintf(fid, "%d,\n", amp*treb(i));
View
8 src/shellext.c
@@ -31,7 +31,7 @@
#include "shellext.h"
#include "fbgrab.h"
-int main_viwrite(int argc, char **argv)
+static int main_viwrite(int argc, char **argv)
{
unsigned int reg, val;
int fd;
@@ -59,7 +59,7 @@ int main_viwrite(int argc, char **argv)
return 0;
}
-int main_viread(int argc, char **argv)
+static int main_viread(int argc, char **argv)
{
int fd;
unsigned int rv;
@@ -86,7 +86,7 @@ int main_viread(int argc, char **argv)
return 0;
}
-int main_erase(int argc, char **argv)
+static int main_erase(int argc, char **argv)
{
int fd;
int r;
@@ -137,7 +137,7 @@ int main_erase(int argc, char **argv)
return 0;
}
-int main_fbgrab(int argc, char **argv)
+static int main_fbgrab(int argc, char **argv)
{
int ret = 0;
View
5 src/shortcuts.c
@@ -29,6 +29,7 @@
#include "fb.h"
#include "gui/guirender.h"
#include "gui/flash.h"
+#include "shortcuts.h"
static int ctrl, alt;
static int f9_pressed;
@@ -36,7 +37,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 +103,7 @@ static void shortcuts_callback(mtk_event *e, int count)
}
}
-void init_shortcuts()
+void init_shortcuts(void)
{
input_add_callback(shortcuts_callback);
}
View
2  src/shortcuts.h
@@ -18,6 +18,6 @@
#ifndef __SHORTCUTS_H
#define __SHORTCUTS_H
-void init_shortcuts();
+void init_shortcuts(void);
#endif /* __SHORTCUTS_H */
View
36 src/sysconfig.c
@@ -162,11 +162,11 @@ 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()
+int sysconfig_is_rescue(void)
{
const char *bsp_cmdline;
@@ -176,9 +176,9 @@ int sysconfig_is_rescue()
return strcmp(bsp_cmdline, "rescue") == 0;
}
-static void start_dhcp_task();
+static void start_dhcp_task(void);
-void sysconfig_load()
+void sysconfig_load(void)
{
struct sysconfig conf;
@@ -216,7 +216,7 @@ void sysconfig_load()
}
}
-void sysconfig_save()
+void sysconfig_save(void)
{
FILE *fd;
@@ -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;
@@ -334,7 +334,7 @@ static void route_set_gateway(unsigned int ip)
/* get */
-int sysconfig_get_resolution()
+int sysconfig_get_resolution(void)
{
return sysconfig.resolution;
}
@@ -344,12 +344,12 @@ void sysconfig_get_wallpaper(char *wallpaper)
strcpy(wallpaper, sysconfig.wallpaper);
}
-int sysconfig_get_language()
+int sysconfig_get_language(void)
{
return sysconfig.language;
}
-int sysconfig_get_keyboard_layout()
+int sysconfig_get_keyboard_layout(void)
{
return sysconfig.keyboard_layout;
}
@@ -376,7 +376,7 @@ void sysconfig_get_credentials(char *login, char *password)
strcpy(password, sysconfig.password);
}
-int sysconfig_get_autostart_mode()
+int sysconfig_get_autostart_mode(void)
{
return sysconfig.autostart_mode;
}
@@ -405,7 +405,7 @@ void sysconfig_set_resolution(int resolution)
fb_resize_gui();
}
-void sysconfig_set_mtk_wallpaper()
+void sysconfig_set_mtk_wallpaper(void)
{
struct pixbuf *p;
@@ -439,7 +439,7 @@ void sysconfig_set_language(int language)
sysconfig_set_mtk_language();
}
-void sysconfig_set_mtk_language()
+void sysconfig_set_mtk_language(void)
{
switch(sysconfig.language) {
case SC_LANGUAGE_FRENCH:
@@ -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);
}
View
18 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);