summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-03-24 01:51:12 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-03-24 01:51:12 +0000
commit126d821654295a9799b93e99d309355f73d2a843 (patch)
tree0e92d4a96ba04280c71b7c904403fecd3f77492b
parent4e689364f78d089d00aee9083ee7a7ae36bcb1e7 (diff)
From: Atari Ace [mailto:atari_ace@verizon.net]
Subject: [patch] Minor static/const/include fixups Hi mamedev, Another batch of minor static/const/include fixes. Very boring, very pedantic. ;) ~aa
-rw-r--r--src/emu/cpu/ssp1601/ssp1601.c4
-rw-r--r--src/emu/sound/aica.c4
-rw-r--r--src/emu/sound/aica.h2
-rw-r--r--src/emu/video/v9938.c2
-rw-r--r--src/mame/audio/qix.c2
-rw-r--r--src/mame/drivers/dkong.c2
-rw-r--r--src/mame/drivers/equites.c2
-rw-r--r--src/mame/drivers/firetrk.c2
-rw-r--r--src/mame/drivers/fitfight.c2
-rw-r--r--src/mame/drivers/homedata.c2
-rw-r--r--src/mame/drivers/kncljoe.c4
-rw-r--r--src/mame/drivers/meritm.c24
-rw-r--r--src/mame/drivers/mpu4drvr.c2
-rw-r--r--src/mame/includes/equites.h3
-rw-r--r--src/mame/includes/stactics.h1
-rw-r--r--src/mame/video/dc.c2
-rw-r--r--src/mame/video/ladybug.c2
17 files changed, 29 insertions, 33 deletions
diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c
index f3dee945d7c..675d8d5d7a4 100644
--- a/src/emu/cpu/ssp1601/ssp1601.c
+++ b/src/emu/cpu/ssp1601/ssp1601.c
@@ -317,7 +317,7 @@ static void write_AL(int reg, UINT32 d)
typedef UINT32 (*read_func_t)(int reg);
typedef void (*write_func_t)(int reg, UINT32 d);
-static read_func_t reg_read_handlers[16] =
+static const read_func_t reg_read_handlers[16] =
{
read_unknown, read_unknown, read_unknown, read_unknown, // -, X, Y, A
read_unknown, // 4 ST
@@ -334,7 +334,7 @@ static read_func_t reg_read_handlers[16] =
read_AL
};
-static write_func_t reg_write_handlers[16] =
+static const write_func_t reg_write_handlers[16] =
{
write_unknown, write_unknown, write_unknown, write_unknown, // -, X, Y, A
write_ST,
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index ffde1fcb03c..2ac522e0bf4 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -429,8 +429,8 @@ static void Compute_LFO(struct _SLOT *slot)
#define ADPCMSHIFT 8
#define ADFIX(f) (int) ((float) f*(float) (1<<ADPCMSHIFT))
-const int TableQuant[8]={ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(1.19921875),ADFIX(1.59765625),ADFIX(2.0),ADFIX(2.3984375)};
-const int quant_mul[16]= { 1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15};
+static const int TableQuant[8]={ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(1.19921875),ADFIX(1.59765625),ADFIX(2.0),ADFIX(2.3984375)};
+static const int quant_mul[16]= { 1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15};
static void InitADPCM(int *PrevSignal, int *PrevQuant)
{
diff --git a/src/emu/sound/aica.h b/src/emu/sound/aica.h
index 52a4c8a5037..aac539a84d0 100644
--- a/src/emu/sound/aica.h
+++ b/src/emu/sound/aica.h
@@ -20,8 +20,6 @@ void AICA_set_ram_base(int which, void *base, int size);
// AICA register access
READ16_HANDLER( AICA_0_r );
WRITE16_HANDLER( AICA_0_w );
-READ16_HANDLER( AICA_1_r );
-WRITE16_HANDLER( AICA_1_w );
// MIDI I/O access
WRITE16_HANDLER( AICA_MidiIn );
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index 0a2af8b8ca1..1bb113141be 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -352,7 +352,7 @@ static int v9938_vram_read (int offset)
return vdp->vram[offset];
}
-void v9938_vram_w( UINT8 data )
+static void v9938_vram_w( UINT8 data )
{
int address;
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index 7073f8b75bd..37e642b6d18 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -50,7 +50,7 @@ static const discrete_comp_adder_table qix_attn_table =
{RES_K(22)+250, RES_K(10)+250, RES_K(5.6)+250, RES_K(3.3)+250}
};
-DISCRETE_SOUND_START(qix)
+static DISCRETE_SOUND_START(qix)
/* NODE */
DISCRETE_INPUTX_DATA(QIX_DAC_DATA, 128, -128*128, 128)
DISCRETE_INPUT_DATA (QIX_VOL_DATA)
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index d500c53438b..3913d7a0ef2 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -337,7 +337,7 @@ static void p8257_ctl_w(UINT8 data);
*
*************************************/
-static z80dma_interface dk3_dma =
+static const z80dma_interface dk3_dma =
{
0,
CLOCK_1H,
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 42377b76988..7b64c57355e 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1135,7 +1135,7 @@ static const char *const alphamc07_sample_names[] =
0
};
-const struct Samplesinterface alphamc07_samples_interface =
+static const struct Samplesinterface alphamc07_samples_interface =
{
3, /* 3 channels */
alphamc07_sample_names
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index 5a67d90e1ae..29dcc3bcdc5 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -13,8 +13,6 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
#define FIRETRK_CPU_CLOCK_750KZ (12096000 / 16)
-int firetrk_game;
-
static UINT8 in_service_mode;
static UINT32 dial[2];
static UINT8 steer_dir[2];
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index ccdfd8dcc11..b494ee1cf00 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -275,7 +275,7 @@ static INTERRUPT_GEN( snd_irq )
cpunum_set_input_line(machine, 1,UPD7810_INTF2,HOLD_LINE);
}
-static UPD7810_CONFIG sound_cpu_config =
+static const UPD7810_CONFIG sound_cpu_config =
{
TYPE_7810,
0
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index cfc38274fef..089d82e37c3 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1307,7 +1307,7 @@ static const struct YM2203interface ym2203_interface =
};
-static UPD7810_CONFIG upd_config =
+static const UPD7810_CONFIG upd_config =
{
TYPE_7810,
NULL /* io_callback */
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 2c7354c4c02..9856286b368 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -44,7 +44,7 @@ extern UINT8 *kncljoe_scrollregs;
static UINT8 port1, port2;
-WRITE8_HANDLER( sound_cmd_w )
+static WRITE8_HANDLER( sound_cmd_w )
{
if ((data & 0x80) == 0)
soundlatch_w(machine, 0, data & 0x7f);
@@ -253,7 +253,7 @@ static const struct AY8910interface ay8910_interface =
unused_w
};
-INTERRUPT_GEN (sound_nmi)
+static INTERRUPT_GEN (sound_nmi)
{
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index c175e14268d..9d8018e0f46 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -99,7 +99,7 @@ static struct
} ds1204;
-void ds1204_w( int rst, int clk, int dq )
+static void ds1204_w( int rst, int clk, int dq )
{
//logerror("ds1204_w: rst = %d, clk = %d, dq = %d\n", rst, clk, dq );
if ( rst == 0 )
@@ -178,13 +178,13 @@ void ds1204_w( int rst, int clk, int dq )
}
};
-int ds1204_r(void)
+static int ds1204_r(void)
{
//logerror("ds1204_r\n");
return ds1204.out_bit;
};
-void ds1204_init(const UINT8* key, const UINT8* nvram)
+static void ds1204_init(const UINT8* key, const UINT8* nvram)
{
memset(&ds1204, 0, sizeof(ds1204));
if (key)
@@ -350,7 +350,7 @@ static void microtouch_rx(int count, UINT8* data)
}
};
-INPUT_PORTS_START(microtouch)
+static INPUT_PORTS_START(microtouch)
PORT_START_TAG("TOUCH")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_IMPULSE(10) PORT_NAME( "Touch screen" )
PORT_START_TAG("TOUCH_X")
@@ -513,7 +513,7 @@ static VIDEO_UPDATE( meritm )
static int meritm_bank;
static int meritm_psd_a15;
-void meritm_crt250_switch_banks( void )
+static void meritm_crt250_switch_banks( void )
{
int rombank = (meritm_bank & 0x07) ^ 0x07;
@@ -526,7 +526,7 @@ static WRITE8_HANDLER(meritm_crt250_bank_w)
meritm_crt250_switch_banks();
};
-void meritm_switch_banks( void )
+static void meritm_switch_banks( void )
{
int rambank = (meritm_psd_a15 >> 2) & 0x3;
int rombank = (((meritm_bank >> 3) & 0x3) << 5) |
@@ -623,7 +623,7 @@ static WRITE8_HANDLER(meritm_crt250_questions_bank_w)
*
*************************************/
-WRITE8_HANDLER(meritm_ds1644_w)
+static WRITE8_HANDLER(meritm_ds1644_w)
{
int rambank = (meritm_psd_a15 >> 2) & 0x3;
if (rambank < 3)
@@ -647,7 +647,7 @@ static UINT8 binary_to_BCD(UINT8 data)
return ((data / 10) << 4) | (data %10);
}
-READ8_HANDLER(meritm_ds1644_r)
+static READ8_HANDLER(meritm_ds1644_r)
{
mame_system_time systime;
int rambank = (meritm_psd_a15 >> 2) & 0x3;
@@ -811,13 +811,13 @@ INPUT_PORTS_END
*
*************************************/
-READ8_HANDLER(meritm_8255_port_c_r)
+static READ8_HANDLER(meritm_8255_port_c_r)
{
//logerror( "8255 port C read\n" );
return 0xff;
};
-WRITE8_HANDLER(meritm_crt250_port_b_w)
+static WRITE8_HANDLER(meritm_crt250_port_b_w)
{
//popmessage("Lamps: %d %d %d %d %d %d %d", BIT(data,0), BIT(data,1), BIT(data,2), BIT(data,3), BIT(data,4), BIT(data,5), BIT(data,6) );
output_set_value("P1 DISC 1 LAMP", !BIT(data,0));
@@ -862,12 +862,12 @@ static const ppi8255_interface crt250_ppi8255_intf =
Port B: Bits 0,1 used
*/
-READ8_HANDLER(meritm_ay8930_port_a_r)
+static READ8_HANDLER(meritm_ay8930_port_a_r)
{
return readinputportbytag_safe("DSW", 0);
};
-WRITE8_HANDLER(meritm_ay8930_port_b_w)
+static WRITE8_HANDLER(meritm_ay8930_port_b_w)
{
// lamps
};
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 554f0b3b057..e1a8af7ad13 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1566,7 +1566,7 @@ static VIDEO_UPDATE(dealem)
return 0;
}
-MC6845_ON_VSYNC_CHANGED( dealem_vsync_changed )
+static MC6845_ON_VSYNC_CHANGED( dealem_vsync_changed )
{
cpunum_set_input_line(device->machine, 0, INPUT_LINE_NMI, vsync);
}
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index ac3772f7d96..9cbd26c584b 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -1,3 +1,5 @@
+/*----------- defined in video/equites.c -----------*/
+
extern UINT16 *equites_bg_videoram;
extern READ16_HANDLER(equites_fg_videoram_r);
@@ -7,7 +9,6 @@ extern WRITE16_HANDLER(equites_scrollreg_w);
extern WRITE16_HANDLER(equites_bgcolor_w);
extern WRITE16_HANDLER(splndrbt_selchar0_w);
extern WRITE16_HANDLER(splndrbt_selchar1_w);
-extern WRITE16_HANDLER(splndrbt_bgcolor_w);
extern WRITE16_HANDLER(equites_flip0_w);
extern WRITE16_HANDLER(equites_flip1_w);
extern WRITE16_HANDLER(splndrbt_flip0_w);
diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h
index 66d8612ffb2..09623d55fb4 100644
--- a/src/mame/includes/stactics.h
+++ b/src/mame/includes/stactics.h
@@ -40,7 +40,6 @@ struct _stactics_state
MACHINE_DRIVER_EXTERN( stactics_video );
-WRITE8_HANDLER( stactics_palette_w );
WRITE8_HANDLER( stactics_scroll_ram_w );
WRITE8_HANDLER( stactics_speed_latch_w );
WRITE8_HANDLER( stactics_shot_trigger_w );
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index 5dcb6b76072..7064583aad4 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -610,7 +610,7 @@ static void pvr_build_parameterconfig(void)
pvr_parameterconfig[a] = pvr_parameterconfig[a-1];
}
-TIMER_CALLBACK(vbout)
+static TIMER_CALLBACK(vbout)
{
dc_sysctrl_regs[SB_ISTNRM] |= IST_VBL_OUT; // V Blank-out interrupt
update_interrupt_status();
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index ffce878ebb0..7d179c4d41c 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -11,7 +11,7 @@
UINT8 *sraider_grid_data;
-UINT8 sraider_grid_color;
+static UINT8 sraider_grid_color;
/* Use the Zero Hour star generator board */
void redclash_set_stars_enable( UINT8 on );