summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2007-12-18 08:09:03 +0000
committer Aaron Giles <aaron@aarongiles.com>2007-12-18 08:09:03 +0000
commit75265e5e230644374d5525ccacb729c13cc70ab5 (patch)
tree5a50921a8a20546a13ca2ca4a8494c6dd35d98f3 /src/mame/machine
parent8a9ea25d7403de5d64ebc6265c00c971f632226f (diff)
Changes for MAME 0.122.
Diffstat (limited to 'src/mame/machine')
-rw-r--r--src/mame/machine/bonzeadv.c2
-rw-r--r--src/mame/machine/namcos1.c4
-rw-r--r--src/mame/machine/opwolf.c2
-rw-r--r--src/mame/machine/slikshot.c26
-rw-r--r--src/mame/machine/stvcd.c9
-rw-r--r--src/mame/machine/stvcd.h1
-rw-r--r--src/mame/machine/tx1.c2
7 files changed, 15 insertions, 31 deletions
diff --git a/src/mame/machine/bonzeadv.c b/src/mame/machine/bonzeadv.c
index ded86335c52..d8e705871ef 100644
--- a/src/mame/machine/bonzeadv.c
+++ b/src/mame/machine/bonzeadv.c
@@ -295,7 +295,7 @@ static const struct cchip_mapping level08[] =
{ 0xff }
};
-static const struct cchip_mapping* levelData[]=
+static const struct cchip_mapping *const levelData[]=
{
level00,
level01,
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index ef4349ab30a..7186e51e32e 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -660,7 +660,7 @@ static WRITE8_HANDLER( unknown_w )
}
/* Main bankswitching routine */
-static void set_bank(int banknum, bankhandler *handler)
+static void set_bank(int banknum, const bankhandler *handler)
{
int bankstart = (banknum & 7) * 0x2000;
int cpunum = (banknum >> 3) & 1;
@@ -834,7 +834,7 @@ static void namcos1_build_banks(read8_handler key_r,write8_handler key_w)
MACHINE_RESET( namcos1 )
{
- static bankhandler unknown_handler = { unknown_r, unknown_w, 0, NULL };
+ static const bankhandler unknown_handler = { unknown_r, unknown_w, 0, NULL };
int bank;
/* Point all of our bankhandlers to the error handlers */
diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c
index efd244f010b..b1c4cfdfc93 100644
--- a/src/mame/machine/opwolf.c
+++ b/src/mame/machine/opwolf.c
@@ -272,7 +272,7 @@ static const UINT16 level_data_06[0xcc] =
0x0300,0x4e01,0x5006,0x0042
};
-static const UINT16* level_data_lookup[] =
+static const UINT16 *const level_data_lookup[] =
{
level_data_00,
level_data_01,
diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c
index 7fe346b2b81..7b0edc27c21 100644
--- a/src/mame/machine/slikshot.c
+++ b/src/mame/machine/slikshot.c
@@ -90,8 +90,6 @@ static int curxpos;
static int last_ytotal;
static UINT8 crosshair_vis;
-static int crosshair_min;
-static int crosshair_max;
@@ -534,22 +532,6 @@ WRITE8_HANDLER( slikshot_z80_control_w )
/*************************************
*
- * slikshot_set_crosshair_range
- *
- * set the range for the crosshair
- *
- *************************************/
-
-void slikshot_set_crosshair_range(int miny, int maxy)
-{
- crosshair_min = miny;
- crosshair_max = maxy;
-}
-
-
-
-/*************************************
- *
* video_update_slikshot
*
*************************************/
@@ -612,14 +594,6 @@ VIDEO_UPDATE( slikshot )
memset(ybuffer, 0, sizeof(ybuffer));
}
- /* draw a crosshair (rotated) */
- if (crosshair_vis)
- {
-// if ((machine->gamedrv->flags & ORIENTATION_MASK) == ROT90)
-// draw_crosshair(bitmap, 256 - 48, (crosshair_min + crosshair_max) / 2 - (curxpos * (crosshair_max - crosshair_min) / 0x100), cliprect, 0);
-// else
-// draw_crosshair(bitmap, 48, (crosshair_min + crosshair_max) / 2 + (curxpos * (crosshair_max - crosshair_min) / 0x100), cliprect, 0);
- }
return 0;
}
diff --git a/src/mame/machine/stvcd.c b/src/mame/machine/stvcd.c
index 58e6bafdcb2..a0b442f3089 100644
--- a/src/mame/machine/stvcd.c
+++ b/src/mame/machine/stvcd.c
@@ -1550,6 +1550,15 @@ static void make_dir_current(UINT32 fad)
}
}
+void stvcd_exit(running_machine* machine)
+{
+ if (curdir != (direntryT *)NULL)
+ {
+ free((void *)curdir);
+ curdir = (direntryT *)NULL;
+ }
+}
+
static void cd_readTOC(void)
{
int i, ntrks, toclen, tocptr, fad;
diff --git a/src/mame/machine/stvcd.h b/src/mame/machine/stvcd.h
index 46d264d6d73..11ca4a5ff21 100644
--- a/src/mame/machine/stvcd.h
+++ b/src/mame/machine/stvcd.h
@@ -10,6 +10,7 @@
#define __STVCD_H__
void stvcd_reset(void);
+void stvcd_exit(running_machine* machine);
READ32_HANDLER( stvcd_r );
WRITE32_HANDLER( stvcd_w );
diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c
index 4cf3134049e..0b1930d7014 100644
--- a/src/mame/machine/tx1.c
+++ b/src/mame/machine/tx1.c
@@ -7,7 +7,7 @@
#include "driver.h"
static INT16 AU_DATA;
-static INT16 *AU_PTR = &AU_DATA;
+static INT16 *const AU_PTR = &AU_DATA;
static UINT16 inst_index;
/* Internal registers and so forth */