Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: m-labs/flickernoise
base: 84269d1
...
head fork: m-labs/flickernoise
compare: 63674ae
  • 7 commits
  • 22 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 12, 2011
Werner Almesberger wpwrak src/renderer/: convert old-style function declarations
foo() is old-style and may make the compiler do stupid things.
Better to do it ANSI-style, i.e., foo(void)
2ad458e
Werner Almesberger wpwrak renderer/compiler.c: include stdbool.h
This can be needed for out-of-tree compilation of compiler.c
7be1c97
Werner Almesberger wpwrak src/Makefile: add quiet compilation and make it the default
To return to the previous level of verbosity, use  make V=1
f00b23f
Werner Almesberger wpwrak move compiler.[ch] from renderer/ to compiler/ 6e7a7da
Werner Almesberger wpwrak compiler.c: some of the usual whitespace cleanup
Wrap long lines, add blank line between return and goto label, and
remove trailing tabs.
307fdbd
Werner Almesberger wpwrak compiler.c: fix off-by-one allocation typo f4869ce
Werner Almesberger wpwrak compiler.c: free user-defined variables after compiling the patch
This patch also corrects a heap-corruption bug in unique_free.
Freeing the variables accelerates compilation of the regular patch
set by about 35-40 ms.
63674ae
32 src/Makefile
View
@@ -3,9 +3,29 @@ RTEMS_MAKEFILE_PATH ?= \
/opt/rtems-$(RTEMS_VERSION)/lm32-rtems$(RTEMS_VERSION)/milkymist/
WITH_PDF ?= 0
-CC = lm32-rtems$(RTEMS_VERSION)-gcc
-LD = lm32-rtems$(RTEMS_VERSION)-gcc
-OBJCOPY = lm32-rtems$(RTEMS_VERSION)-objcopy
+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
+
+ifeq ($(V),1)
+ CC = $(CC_normal)
+ AR = $(AR_normal)
+ AS = $(AS_normal)
+ LD = $(LD_normal)
+ OBJCOPY = $(OBJCOPY_normal)
+ RANLIB = $(RANLIB_normal)
+else
+ CC = $(CC_quiet)
+ AR = $(AR_quiet)
+ AS = $(AS_quiet)
+ LD = $(LD_quiet)
+ OBJCOPY = $(OBJCOPY_quiet)
+ RANLIB = $(RANLIB_quiet)
+endif
CFLAGS = -O9 -Wall -mbarrel-shift-enabled -mmultiply-enabled \
-mdivide-enabled -msign-extend-enabled -fsingle-precision-constant \
@@ -33,10 +53,10 @@ ifeq ($(WITH_PDF),1)
endif
OBJS += $(addprefix translations/,french.o german.o)
OBJS += $(addprefix renderer/,framedescriptor.o analyzer.o sampler.o \
- compiler.o eval.o line.o wave.o font.o osd.o raster.o renderer.o \
+ eval.o line.o wave.o font.o osd.o raster.o renderer.o \
videoinreconf.o)
-OBJS += $(addprefix compiler/,fpvm.o parser_helper.o scanner.o parser.o \
- unique.o)
+OBJS += $(addprefix compiler/,compiler.o fpvm.o parser_helper.o scanner.o \
+ parser.o unique.o)
POBJS=$(addprefix $(OBJDIR)/,$(OBJS))
120 src/renderer/compiler.c → src/compiler/compiler.c
View
@@ -16,6 +16,7 @@
*/
#include <assert.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -26,6 +27,7 @@
#include <fpvm/pfpu.h>
#include "../pixbuf/pixbuf.h"
+#include "unique.h"
#include "compiler.h"
struct compiler_sc {
@@ -148,7 +150,7 @@ static const char pfv_names[COMP_PFV_COUNT][FPVM_MAXSYMLEN] = {
"osc2",
"osc3",
"osc4",
-
+
"midi1",
"midi2",
"midi3",
@@ -159,7 +161,7 @@ static const char pfv_names[COMP_PFV_COUNT][FPVM_MAXSYMLEN] = {
"midi8",
"video_a",
-
+
"image1_a",
"image1_x",
"image1_y",
@@ -173,7 +175,7 @@ static const char pfv_names[COMP_PFV_COUNT][FPVM_MAXSYMLEN] = {
static int pfv_from_name(const char *name)
{
int i;
-
+
for(i=0;i<COMP_PFV_COUNT;i++) {
if(strcmp(pfv_names[i], name) == 0)
return i;
@@ -192,10 +194,14 @@ static int pfv_from_name(const char *name)
static void pfv_update_patch_requires(struct compiler_sc *sc, int pfv)
{
- if(pfv >= pfv_dmx1 && pfv <= pfv_idmx8) sc->p->require |= REQUIRE_DMX;
- if(pfv >= pfv_osc1 && pfv <= pfv_osc4) sc->p->require |= REQUIRE_OSC;
- if(pfv >= pfv_midi1 && pfv <= pfv_midi8) sc->p->require |= REQUIRE_MIDI;
- if(pfv == pfv_video_a) sc->p->require |= REQUIRE_VIDEO;
+ if(pfv >= pfv_dmx1 && pfv <= pfv_idmx8)
+ sc->p->require |= REQUIRE_DMX;
+ if(pfv >= pfv_osc1 && pfv <= pfv_osc4)
+ sc->p->require |= REQUIRE_OSC;
+ if(pfv >= pfv_midi1 && pfv <= pfv_midi8)
+ sc->p->require |= REQUIRE_MIDI;
+ if(pfv == pfv_video_a)
+ sc->p->require |= REQUIRE_VIDEO;
}
static void load_defaults(struct compiler_sc *sc)
@@ -226,9 +232,9 @@ static void load_defaults(struct compiler_sc *sc)
sc->p->pfv_initial[pfv_mv_l] = 1.0;
sc->p->pfv_initial[pfv_warp_scale] = 1.0;
-
+
sc->p->pfv_initial[pfv_video_echo_zoom] = 1.0;
-
+
sc->p->pfv_initial[pfv_image1_x] = 0.5;
sc->p->pfv_initial[pfv_image1_y] = 0.5;
sc->p->pfv_initial[pfv_image1_zoom] = 1.0;
@@ -262,7 +268,7 @@ static void pfv_bind_callback(void *_sc, const char *sym, int reg)
{
struct compiler_sc *sc = _sc;
int pfv;
-
+
pfv = pfv_from_name(sym);
if(pfv >= 0) {
pfv_update_patch_requires(sc, pfv);
@@ -295,14 +301,16 @@ static bool finalize_pfv(struct compiler_sc *sc)
return true;
fail_fpvm:
- comp_report(sc, "failed to finalize per-frame variables: %s", fpvm_get_last_error(&sc->pfv_fragment));
+ comp_report(sc, "failed to finalize per-frame variables: %s",
+ fpvm_get_last_error(&sc->pfv_fragment));
return false;
}
static bool schedule_pfv(struct compiler_sc *sc)
{
sc->p->perframe_prog_length = fpvm_default_schedule(&sc->pfv_fragment,
- (unsigned int *)sc->p->perframe_prog, (unsigned int *)sc->p->perframe_regs);
+ (unsigned int *)sc->p->perframe_prog,
+ (unsigned int *)sc->p->perframe_regs);
if(sc->p->perframe_prog_length < 0) {
comp_report(sc, "per-frame VLIW scheduling failed");
return false;
@@ -319,7 +327,8 @@ static bool schedule_pfv(struct compiler_sc *sc)
static bool add_per_frame(struct compiler_sc *sc, char *dest, char *val)
{
if(!fpvm_assign(&sc->pfv_fragment, dest, val)) {
- comp_report(sc, "failed to add per-frame equation l. %d: %s", sc->linenr, fpvm_get_last_error(&sc->pfv_fragment));
+ comp_report(sc, "failed to add per-frame equation l. %d: %s",
+ sc->linenr, fpvm_get_last_error(&sc->pfv_fragment));
return false;
}
return true;
@@ -374,12 +383,12 @@ static const char pvv_names[COMP_PVV_COUNT][FPVM_MAXSYMLEN] = {
"idmx6",
"idmx7",
"idmx8",
-
+
"osc1",
"osc2",
"osc3",
"osc4",
-
+
"midi1",
"midi2",
"midi3",
@@ -393,7 +402,7 @@ static const char pvv_names[COMP_PVV_COUNT][FPVM_MAXSYMLEN] = {
static int pvv_from_name(const char *name)
{
int i;
-
+
for(i=0;i<COMP_PVV_COUNT;i++) {
if(strcmp(pvv_names[i], name) == 0)
return i;
@@ -403,16 +412,19 @@ static int pvv_from_name(const char *name)
static void pvv_update_patch_requires(struct compiler_sc *sc, int pvv)
{
- if(pvv >= pvv_idmx1 && pvv <= pvv_idmx8) sc->p->require |= REQUIRE_DMX;
- if(pvv >= pvv_osc1 && pvv <= pvv_osc4) sc->p->require |= REQUIRE_OSC;
- if(pvv >= pvv_midi1 && pvv <= pvv_midi8) sc->p->require |= REQUIRE_MIDI;
+ if(pvv >= pvv_idmx1 && pvv <= pvv_idmx8)
+ sc->p->require |= REQUIRE_DMX;
+ if(pvv >= pvv_osc1 && pvv <= pvv_osc4)
+ sc->p->require |= REQUIRE_OSC;
+ if(pvv >= pvv_midi1 && pvv <= pvv_midi8)
+ sc->p->require |= REQUIRE_MIDI;
}
static void pvv_bind_callback(void *_sc, const char *sym, int reg)
{
struct compiler_sc *sc = _sc;
int pvv;
-
+
pvv = pvv_from_name(sym);
if(pvv >= 0) {
pvv_update_patch_requires(sc, pvv);
@@ -428,28 +440,31 @@ static bool init_pvv(struct compiler_sc *sc)
for(i=0;i<COMP_PVV_COUNT;i++)
sc->p->pvv_allocation[i] = -1;
fpvm_set_bind_callback(&sc->pvv_fragment, pvv_bind_callback, sc);
-
+
fpvm_set_bind_mode(&sc->pvv_fragment, FPVM_BIND_SOURCE);
- #define A(dest, val) if(!fpvm_assign(&sc->pvv_fragment, dest, val)) goto fail_assign
+ #define A(dest, val) \
+ if(!fpvm_assign(&sc->pvv_fragment, dest, val)) goto fail_assign
A("x", "i2f(_Xi)*_hmeshsize");
A("y", "i2f(_Yi)*_vmeshsize");
A("rad", "sqrt(sqr(x-0.5)+sqr(y-0.5))");
/* TODO: generate ang */
#undef A
fpvm_set_bind_mode(&sc->pvv_fragment, FPVM_BIND_ALL);
-
+
return true;
fail_assign:
- comp_report(sc, "failed to add equation to per-vertex header: %s", fpvm_get_last_error(&sc->pvv_fragment));
+ comp_report(sc, "failed to add equation to per-vertex header: %s",
+ fpvm_get_last_error(&sc->pvv_fragment));
return false;
}
static int finalize_pvv(struct compiler_sc *sc)
{
fpvm_set_bind_mode(&sc->pvv_fragment, FPVM_BIND_SOURCE);
-
- #define A(dest, val) if(!fpvm_assign(&sc->pvv_fragment, dest, val)) goto fail_assign
+
+ #define A(dest, val) \
+ if(!fpvm_assign(&sc->pvv_fragment, dest, val)) goto fail_assign
/* Zoom */
A("_invzoom", "1/zoom");
@@ -501,18 +516,23 @@ static int finalize_pvv(struct compiler_sc *sc)
#endif
return true;
+
fail_assign:
- comp_report(sc, "failed to add equation to per-vertex footer: %s", fpvm_get_last_error(&sc->pvv_fragment));
+ comp_report(sc, "failed to add equation to per-vertex footer: %s",
+ fpvm_get_last_error(&sc->pvv_fragment));
return false;
+
fail_finalize:
- comp_report(sc, "failed to finalize per-vertex variables: %s", fpvm_get_last_error(&sc->pvv_fragment));
+ comp_report(sc, "failed to finalize per-vertex variables: %s",
+ fpvm_get_last_error(&sc->pvv_fragment));
return false;
}
static bool schedule_pvv(struct compiler_sc *sc)
{
sc->p->pervertex_prog_length = fpvm_default_schedule(&sc->pvv_fragment,
- (unsigned int *)sc->p->pervertex_prog, (unsigned int *)sc->p->pervertex_regs);
+ (unsigned int *)sc->p->pervertex_prog,
+ (unsigned int *)sc->p->pervertex_regs);
if(sc->p->pervertex_prog_length < 0) {
comp_report(sc, "per-vertex VLIW scheduling failed");
return false;
@@ -528,7 +548,8 @@ static bool schedule_pvv(struct compiler_sc *sc)
static bool add_per_vertex(struct compiler_sc *sc, char *dest, char *val)
{
if(!fpvm_assign(&sc->pvv_fragment, dest, val)) {
- comp_report(sc, "failed to add per-vertex equation l. %d: %s\n", sc->linenr, fpvm_get_last_error(&sc->pvv_fragment));
+ comp_report(sc, "failed to add per-vertex equation l. %d: %s\n",
+ sc->linenr, fpvm_get_last_error(&sc->pvv_fragment));
return false;
}
return true;
@@ -538,13 +559,15 @@ static bool add_per_vertex(struct compiler_sc *sc, char *dest, char *val)
/* PARSING */
/****************************************************************/
-static bool process_equation(struct compiler_sc *sc, char *equation, bool per_vertex)
+static bool process_equation(struct compiler_sc *sc, char *equation,
+ bool per_vertex)
{
char *c, *c2;
c = strchr(equation, '=');
if(!c) {
- comp_report(sc, "error l.%d: malformed equation (%s)", sc->linenr, equation);
+ comp_report(sc, "error l.%d: malformed equation (%s)",
+ sc->linenr, equation);
return false;
}
*c = 0;
@@ -574,7 +597,8 @@ static bool process_equation(struct compiler_sc *sc, char *equation, bool per_ve
return add_per_frame(sc, equation, c);
}
-static bool process_equations(struct compiler_sc *sc, char *equations, bool per_vertex)
+static bool process_equations(struct compiler_sc *sc, char *equations,
+ bool per_vertex)
{
char *c;
@@ -595,21 +619,23 @@ static bool process_top_assign(struct compiler_sc *sc, char *left, char *right)
while(*right == ' ') right++;
if(*right == 0) return true;
-
+
if(strncmp(left, "imagefile", 9) == 0) {
int image_n;
char *totalname;
-
+
image_n = atoi(left+9);
if((image_n < 1) || (image_n > IMAGE_COUNT)) {
- comp_report(sc, "warning l.%d: ignoring image with out of bounds number %d", sc->linenr, image_n);
+ comp_report(sc, "warning l.%d: ignoring image with out of bounds number %d",
+ sc->linenr, image_n);
return true;
}
image_n--;
if(right[0] == '/')
totalname = strdup(right);
else {
- totalname = malloc(strlen(sc->basedir) + strlen(right) + 0);
+ totalname =
+ malloc(strlen(sc->basedir) + strlen(right) + 1);
if(totalname == NULL) return true;
strcpy(totalname, sc->basedir);
strcat(totalname, right);
@@ -632,11 +658,13 @@ static bool process_top_assign(struct compiler_sc *sc, char *left, char *right)
/* per-frame equation */
return process_equations(sc, right, false);
- if((strncmp(left, "per_vertex", 10) == 0) || (strncmp(left, "per_pixel", 9) == 0))
+ if((strncmp(left, "per_vertex", 10) == 0) ||
+ (strncmp(left, "per_pixel", 9) == 0))
/* per-vertex equation */
return process_equations(sc, right, true);
- comp_report(sc, "warning l.%d: ignoring unknown parameter %s", sc->linenr, left);
+ comp_report(sc, "warning l.%d: ignoring unknown parameter %s",
+ sc->linenr, left);
return true;
}
@@ -692,7 +720,8 @@ static bool parse_patch(struct compiler_sc *sc, char *patch_code)
return true;
}
-struct patch *patch_compile(const char *basedir, const char *patch_code, report_message rmc)
+struct patch *patch_compile(const char *basedir, const char *patch_code,
+ report_message rmc)
{
struct compiler_sc *sc;
struct patch *p;
@@ -734,6 +763,7 @@ struct patch *patch_compile(const char *basedir, const char *patch_code, report_
goto fail;
}
free(patch_code_copy);
+ unique_free();
if(!finalize_pfv(sc)) goto fail;
if(!schedule_pfv(sc)) goto fail;
@@ -742,18 +772,20 @@ struct patch *patch_compile(const char *basedir, const char *patch_code, report_
free(sc);
return p;
+
fail:
free(sc->p);
free(sc);
return NULL;
}
-struct patch *patch_compile_filename(const char *filename, const char *patch_code, report_message rmc)
+struct patch *patch_compile_filename(const char *filename,
+ const char *patch_code, report_message rmc)
{
char *basedir;
char *c;
struct patch *p;
-
+
basedir = strdup(filename);
if(basedir == NULL) return NULL;
c = strrchr(basedir, '/');
@@ -771,7 +803,7 @@ struct patch *patch_copy(struct patch *p)
{
struct patch *new_patch;
int i;
-
+
new_patch = malloc(sizeof(struct patch));
assert(new_patch != NULL);
memcpy(new_patch, p, sizeof(struct patch));
@@ -785,7 +817,7 @@ struct patch *patch_copy(struct patch *p)
void patch_free(struct patch *p)
{
int i;
-
+
for(i=0;i<IMAGE_COUNT;i++)
pixbuf_dec_ref(p->images[i]);
free(p);
2  src/renderer/compiler.h → src/compiler/compiler.h
View
@@ -21,7 +21,7 @@
#include <rtems.h>
#include <bsp/milkymist_pfpu.h>
-#include "framedescriptor.h"
+#include "../renderer/framedescriptor.h"
#include "../pixbuf/pixbuf.h"
enum {
1  src/compiler/unique.c
View
@@ -133,5 +133,6 @@ void unique_free(void)
for(i = 0; i != num_vars; i++)
free((void *) vars[i]);
free(vars);
+ vars = NULL;
num_vars = allocated = 0;
}
2  src/gui/guirender.c
View
@@ -25,7 +25,7 @@
#include <mtkeycodes.h>
#include <bsp/milkymist_video.h>
-#include "../renderer/compiler.h"
+#include "../compiler/compiler.h"
#include "../renderer/renderer.h"
#include "resmgr.h"
#include "../fb.h"
2  src/gui/guirender.h
View
@@ -18,7 +18,7 @@
#ifndef __GUIRENDER_H
#define __GUIRENDER_H
-#include "../renderer/compiler.h"
+#include "../compiler/compiler.h"
typedef void (*guirender_stop_callback)();
2  src/gui/patcheditor.c
View
@@ -27,7 +27,7 @@
#include "filedialog.h"
#include "patcheditor.h"
#include "../renderer/framedescriptor.h"
-#include "../renderer/compiler.h"
+#include "../compiler/compiler.h"
#include "../input.h"
#include "guirender.h"
2  src/gui/performance.c
View
@@ -33,7 +33,7 @@
#include "../fb.h"
#include "messagebox.h"
#include "../config.h"
-#include "../renderer/compiler.h"
+#include "../compiler/compiler.h"
#include "../renderer/renderer.h"
#include "guirender.h"
#include "performance.h"
4 src/renderer/eval.c
View
@@ -28,7 +28,7 @@
#include <bsp/milkymist_tmu.h>
#include "../pixbuf/pixbuf.h"
-#include "compiler.h"
+#include "../compiler/compiler.h"
#include "framedescriptor.h"
#include "renderer.h"
@@ -367,7 +367,7 @@ void eval_input(struct frame_descriptor *frd)
rtems_message_queue_send(eval_q, &frd, sizeof(void *));
}
-void eval_stop()
+void eval_stop(void)
{
void *dummy;
2  src/renderer/eval.h
View
@@ -22,6 +22,6 @@
void eval_start(frd_callback callback);
void eval_input(struct frame_descriptor *frd);
-void eval_stop();
+void eval_stop(void);
#endif /* __EVAL_H */
2  src/renderer/framedescriptor.c
View
@@ -21,7 +21,7 @@
#include "framedescriptor.h"
-struct frame_descriptor *new_frame_descriptor()
+struct frame_descriptor *new_frame_descriptor(void)
{
struct frame_descriptor *frd;
2  src/renderer/framedescriptor.h
View
@@ -84,7 +84,7 @@ struct frame_descriptor {
typedef void (*frd_callback)(struct frame_descriptor *);
-struct frame_descriptor *new_frame_descriptor();
+struct frame_descriptor *new_frame_descriptor(void);
void free_frame_descriptor(struct frame_descriptor *frd);
#endif /* __FRAMEDESCRIPTOR_H */
6 src/renderer/osd.c
View
@@ -35,7 +35,7 @@ static struct font_context osd_font;
static int osd_alpha;
static int osd_timer;
-static void round_corners()
+static void round_corners(void)
{
int i;
int d;
@@ -52,7 +52,7 @@ static void round_corners()
}
}
-void osd_init()
+void osd_init(void)
{
osd_vertices[0][0].x = 0;
osd_vertices[0][0].y = 0;
@@ -74,7 +74,7 @@ void osd_init()
#define OSD_DURATION 90
#define OSD_MAX_ALPHA 40
-static void clear_user_area()
+static void clear_user_area(void)
{
int x, y;
2  src/renderer/osd.h
View
@@ -18,7 +18,7 @@
#ifndef __OSD_H
#define __OSD_H
-void osd_init();
+void osd_init(void);
void osd_event(const char *string);
void osd_per_frame(int tmu_fd, unsigned short *dest, int hres, int vres);
2  src/renderer/raster.c
View
@@ -744,7 +744,7 @@ void raster_input(struct frame_descriptor *frd)
rtems_message_queue_send(raster_q, &frd, sizeof(void *));
}
-void raster_stop()
+void raster_stop(void)
{
void *dummy;
2  src/renderer/raster.h
View
@@ -22,6 +22,6 @@
void raster_start(int framebuffer_fd, frd_callback callback);
void raster_input(struct frame_descriptor *frd);
-void raster_stop();
+void raster_stop(void);
#endif /* __RASTER_H */
8 src/renderer/renderer.c
View
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include "sampler.h"
-#include "compiler.h"
+#include "../compiler/compiler.h"
#include "eval.h"
#include "raster.h"
#include "osd.h"
@@ -40,12 +40,12 @@ static struct patch *mashup_head;
static struct patch *current_patch;
static rtems_id patch_lock;
-void renderer_lock_patch()
+void renderer_lock_patch(void)
{
rtems_semaphore_obtain(patch_lock, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
}
-void renderer_unlock_patch()
+void renderer_unlock_patch(void)
{
rtems_semaphore_release(patch_lock);
}
@@ -175,7 +175,7 @@ void renderer_start(int framebuffer_fd, struct patch *p)
rsswall_start();
}
-void renderer_stop()
+void renderer_stop(void)
{
struct patch *p;
8 src/renderer/renderer.h
View
@@ -18,7 +18,7 @@
#ifndef __RENDERER_H
#define __RENDERER_H
-#include "compiler.h"
+#include "../compiler/compiler.h"
extern int renderer_texsize;
extern int renderer_hmeshlast;
@@ -34,8 +34,8 @@ extern int renderer_squareh;
* 4. call renderer_unlock_patch()
*/
-void renderer_lock_patch();
-void renderer_unlock_patch();
+void renderer_lock_patch(void);
+void renderer_unlock_patch(void);
void renderer_pulse_patch(struct patch *p);
void renderer_add_patch(struct patch *p);
@@ -43,6 +43,6 @@ void renderer_del_patch(struct patch *p);
struct patch *renderer_get_patch(int spin);
void renderer_start(int framebuffer_fd, struct patch *p);
-void renderer_stop();
+void renderer_stop(void);
#endif /* __RENDERER_H */
2  src/renderer/sampler.c
View
@@ -323,7 +323,7 @@ void sampler_return(struct frame_descriptor *frd)
rtems_message_queue_send(returned_q, &frd, sizeof(void *));
}
-void sampler_stop()
+void sampler_stop(void)
{
input_delete_callback(event_callback);
rtems_event_send(sampler_task_id, RTEMS_EVENT_0);
2  src/renderer/sampler.h
View
@@ -22,6 +22,6 @@
void sampler_start(frd_callback callback);
void sampler_return(struct frame_descriptor *frd);
-void sampler_stop();
+void sampler_stop(void);
#endif /* __SAMPLER_H */
2  src/renderer/videoinreconf.c
View
@@ -28,7 +28,7 @@ struct reconf_request {
static rtems_id request_q;
-void init_videoinreconf()
+void init_videoinreconf(void)
{
rtems_status_code sc;
2  src/renderer/videoinreconf.h
View
@@ -18,7 +18,7 @@
#ifndef __VIDEOINRECONF_H
#define __VIDEOINRECONF_H
-void init_videoinreconf();
+void init_videoinreconf(void);
void videoinreconf_request(int cmd, int value);
void videoinreconf_do(int fd);

No commit comments for this range

Something went wrong with that request. Please try again.