summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 14:08:03 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 14:08:03 +0000
commite7db4ccf1afbb6653ae1aae44b1c96c724361985 (patch)
tree9cc7321a75460de67bd0dae4e940b73439a1374b /vidix
parent1f34ddefd2546a37c6efe4fcd9ea3f7627af4a5d (diff)
downloadmpv-e7db4ccf1afbb6653ae1aae44b1c96c724361985.tar.bz2
mpv-e7db4ccf1afbb6653ae1aae44b1c96c724361985.tar.xz
Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/drivers/cyberblade_vid.c2
-rw-r--r--vidix/drivers/mach64_vid.c2
-rw-r--r--vidix/drivers/radeon_vid.c2
-rw-r--r--vidix/drivers/savage_vid.c16
-rw-r--r--vidix/drivers/sis_bridge.c14
-rw-r--r--vidix/drivers/sis_vid.c22
6 files changed, 29 insertions, 29 deletions
diff --git a/vidix/drivers/cyberblade_vid.c b/vidix/drivers/cyberblade_vid.c
index 41984644ed..4dfb59d651 100644
--- a/vidix/drivers/cyberblade_vid.c
+++ b/vidix/drivers/cyberblade_vid.c
@@ -94,7 +94,7 @@ static void SROUTW(int reg,int val)
SROUTB(reg+1,(val>>8)&255);
}
-void DumpRegisters()
+void DumpRegisters(void)
{
int reg,val;
#ifdef DEBUG_LOGFILE
diff --git a/vidix/drivers/mach64_vid.c b/vidix/drivers/mach64_vid.c
index 2bde0803b6..1c43bdeef4 100644
--- a/vidix/drivers/mach64_vid.c
+++ b/vidix/drivers/mach64_vid.c
@@ -304,7 +304,7 @@ static int mach64_get_vert_stretch(void)
return ret;
}
-static void mach64_vid_make_default()
+static void mach64_vid_make_default(void)
{
mach64_fifo_wait(5);
OUTREG(SCALER_COLOUR_CNTL,0x00101000);
diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c
index 57dabec974..4a8c095d48 100644
--- a/vidix/drivers/radeon_vid.c
+++ b/vidix/drivers/radeon_vid.c
@@ -950,7 +950,7 @@ vidix_capability_t def_cap =
};
#ifdef HAVE_X11
-void probe_fireGL_driver() {
+void probe_fireGL_driver(void) {
Display *dp = XOpenDisplay ((void*)0);
int n = 0;
char **extlist;
diff --git a/vidix/drivers/savage_vid.c b/vidix/drivers/savage_vid.c
index 68406ad084..ac19266591 100644
--- a/vidix/drivers/savage_vid.c
+++ b/vidix/drivers/savage_vid.c
@@ -82,7 +82,7 @@
/* CR69[0] = 1 : Mem-mapped regs */
#define USE_MM_FOR_PRI_STREAM_OLD 0x01
-void SavageStreamsOn();
+void SavageStreamsOn(void);
/*
* There are two different streams engines used in the Savage line.
@@ -323,7 +323,7 @@ static struct savage_cards savage_card_ids[] = {
{ PCI_CHIP_PROSAVAGE_DDRK , S3_PROSAVAGE },
};
-void SavageSetColorOld()
+void SavageSetColorOld(void)
{
@@ -360,7 +360,7 @@ void SavageSetColorOld()
}
}
-void SavageSetColorKeyOld()
+void SavageSetColorKeyOld(void)
{
int red, green, blue;
@@ -421,8 +421,8 @@ void SavageSetColorKeyOld()
static void
-SavageDisplayVideoOld(
-){
+SavageDisplayVideoOld(void)
+{
int vgaCRIndex, vgaCRReg, vgaIOBase;
unsigned int ssControl;
int cr92;
@@ -528,7 +528,7 @@ SavageDisplayVideoOld(
}
-void SavageInitStreamsOld()
+void SavageInitStreamsOld(void)
{
/*unsigned long jDelta;*/
unsigned long format = 0;
@@ -582,7 +582,7 @@ void SavageInitStreamsOld()
}
void
-SavageStreamsOn()
+SavageStreamsOn(void)
{
unsigned char jStreamsControl;
unsigned short vgaCRIndex = 0x3d0 + 4;
@@ -726,7 +726,7 @@ static void savage_getscreenproperties(struct savage_info *info){
}
-void SavageStreamsOff()
+void SavageStreamsOff(void)
{
unsigned char jStreamsControl;
unsigned short vgaCRIndex = 0x3d0 + 4;
diff --git a/vidix/drivers/sis_bridge.c b/vidix/drivers/sis_bridge.c
index 68660f22dd..0ac37cf328 100644
--- a/vidix/drivers/sis_bridge.c
+++ b/vidix/drivers/sis_bridge.c
@@ -60,7 +60,7 @@ static int sis_do_sense(int tempbl, int tempbh, int tempcl, int tempch)
/* sense connected devices on 30x bridge */
-static void sis_sense_30x()
+static void sis_sense_30x(void)
{
unsigned char backupP4_0d, backupP2_00, biosflag;
unsigned char testsvhs_tempbl, testsvhs_tempbh;
@@ -356,7 +356,7 @@ static void sis_sense_30x()
}
-static void sis_detect_crt1()
+static void sis_detect_crt1(void)
{
unsigned char CR32;
unsigned char CRT1Detected = 0;
@@ -394,7 +394,7 @@ static void sis_detect_crt1()
}
-static void sis_detect_lcd()
+static void sis_detect_lcd(void)
{
unsigned char CR32, CR36, CR37;
@@ -413,7 +413,7 @@ static void sis_detect_lcd()
}
-static void sis_detect_tv()
+static void sis_detect_tv(void)
{
unsigned char SR16, SR38, CR32, CR38 = 0, CR79;
int temp = 0;
@@ -517,7 +517,7 @@ static void sis_detect_tv()
}
-static void sis_detect_crt2()
+static void sis_detect_crt2(void)
{
unsigned char CR32;
@@ -563,7 +563,7 @@ static void sis_detect_crt2()
/* Preinit: detect video bridge and sense connected devs */
-static void sis_detect_video_bridge()
+static void sis_detect_video_bridge(void)
{
int temp, temp1, temp2;
@@ -708,7 +708,7 @@ static void sis_detect_video_bridge()
/* detect video bridge type and sense connected devices */
-void sis_init_video_bridge()
+void sis_init_video_bridge(void)
{
sis_detect_video_bridge();
diff --git a/vidix/drivers/sis_vid.c b/vidix/drivers/sis_vid.c
index 2562ed7148..535a299581 100644
--- a/vidix/drivers/sis_vid.c
+++ b/vidix/drivers/sis_vid.c
@@ -167,17 +167,17 @@ static unsigned short sis_card_ids[] = {
/** function declarations **/
-extern void sis_init_video_bridge();
+extern void sis_init_video_bridge(void);
static void set_overlay(SISOverlayPtr pOverlay, int index);
-static void close_overlay();
+static void close_overlay(void);
static void calc_scale_factor(SISOverlayPtr pOverlay,
int index, int iscrt2);
static void set_line_buf_size(SISOverlayPtr pOverlay);
static void merge_line_buf(int enable);
static void set_format(SISOverlayPtr pOverlay);
-static void set_colorkey();
+static void set_colorkey(void);
static void set_brightness(uint8_t brightness);
static void set_contrast(uint8_t contrast);
@@ -219,13 +219,13 @@ static void setsrregmask(uint8_t reg, uint8_t data, uint8_t mask)
}
/* vblank checking*/
-static uint8_t vblank_active_CRT1()
+static uint8_t vblank_active_CRT1(void)
{
/* this may be too simplistic? */
return (inSISREG(SISINPSTAT) & 0x08);
}
-static uint8_t vblank_active_CRT2()
+static uint8_t vblank_active_CRT2(void)
{
uint8_t ret;
if (sis_vga_engine == SIS_315_VGA) {
@@ -445,7 +445,7 @@ int vixQueryFourcc(vidix_fourcc_t * to)
return ENOSYS;
}
-static int bridge_in_slave_mode()
+static int bridge_in_slave_mode(void)
{
unsigned char usScratchP1_00;
@@ -465,7 +465,7 @@ static int bridge_in_slave_mode()
/* This does not handle X dual head mode, since 1) vidix doesn't support it
and 2) it doesn't make sense for other gfx drivers */
-static void set_dispmode()
+static void set_dispmode(void)
{
sis_bridge_is_slave = 0;
@@ -489,7 +489,7 @@ static void set_dispmode()
}
}
-static void set_disptype_regs()
+static void set_disptype_regs(void)
{
switch (sis_displaymode) {
case DISPMODE_SINGLE1: /* TW: CRT1 only */
@@ -527,7 +527,7 @@ static void set_disptype_regs()
}
}
-static void init_overlay()
+static void init_overlay(void)
{
/* Initialize first overlay (CRT1) */
@@ -1154,7 +1154,7 @@ static void set_overlay(SISOverlayPtr pOverlay, int index)
/* TW: Overlay MUST NOT be switched off while beam is over it */
-static void close_overlay()
+static void close_overlay(void)
{
uint32_t watchdog;
@@ -1493,7 +1493,7 @@ static void set_format(SISOverlayPtr pOverlay)
setvideoregmask(Index_VI_Control_Misc0, fmt, 0x7c);
}
-static void set_colorkey()
+static void set_colorkey(void)
{
uint8_t r, g, b;