summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-01-22 10:21:52 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-01-22 10:21:52 +0000
commit325dadfdc0d0cd2afcad8d04e8c973793f4866fc (patch)
treebc88745544df69ba4eb523b8ac9f511168f9b193 /src
parent58af175636d898f6bda49c9e119c9f4bce373ed0 (diff)
On Mon, Jan 19, 2009 at 02:48:05PM +0100, Olivier Galibert wrote:
> On Mon, Jan 19, 2009 at 05:37:35AM -0800, R. Belmont wrote: > > My mistake. I thought you were suggesting that we should actually > > somehow handle malloc failures. Given that aborting is an OK way to > > express failure, I'd suggest the return values be changed to DEFER > > and DONT_DEFER to eliminate the conceptual imbalance of OK/DEFER. > > That's where comes the fact that we have 130 OK/DONT_DEFER and 1 > DEFER. It makes me think that the exceptional DEFER case should be > handled by an exceptional function call. > > I know, code talks, but I'm at work right now :-) Here we go. OG.
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpuexec.c2
-rw-r--r--src/emu/devintrf.c39
-rw-r--r--src/emu/devintrf.h15
-rw-r--r--src/emu/machine/6522via.c2
-rw-r--r--src/emu/machine/6526cia.c1
-rw-r--r--src/emu/machine/6532riot.c2
-rw-r--r--src/emu/machine/6821new.c2
-rw-r--r--src/emu/machine/6850acia.c1
-rw-r--r--src/emu/machine/68681.c2
-rw-r--r--src/emu/machine/74123.c2
-rw-r--r--src/emu/machine/8237dma.c2
-rw-r--r--src/emu/machine/8255ppi.c2
-rw-r--r--src/emu/machine/8257dma.c2
-rw-r--r--src/emu/machine/at28c16.c2
-rw-r--r--src/emu/machine/cdp1852.c2
-rw-r--r--src/emu/machine/f3853.c2
-rw-r--r--src/emu/machine/i8243.c1
-rw-r--r--src/emu/machine/idectrl.c2
-rw-r--r--src/emu/machine/latch8.c2
-rw-r--r--src/emu/machine/ldcore.c7
-rw-r--r--src/emu/machine/msm6242.c2
-rw-r--r--src/emu/machine/pci.c2
-rw-r--r--src/emu/machine/pic8259.c2
-rw-r--r--src/emu/machine/pit8253.c8
-rw-r--r--src/emu/machine/smc91c9x.c2
-rw-r--r--src/emu/machine/timekpr.c2
-rw-r--r--src/emu/machine/x2212.c2
-rw-r--r--src/emu/machine/z80ctc.c1
-rw-r--r--src/emu/machine/z80dma.c2
-rw-r--r--src/emu/machine/z80pio.c2
-rw-r--r--src/emu/machine/z80sio.c1
-rw-r--r--src/emu/sndintrf.h4
-rw-r--r--src/emu/sound.c2
-rw-r--r--src/emu/sound/2151intf.c1
-rw-r--r--src/emu/sound/2203intf.c2
-rw-r--r--src/emu/sound/2413intf.c2
-rw-r--r--src/emu/sound/2608intf.c1
-rw-r--r--src/emu/sound/2610intf.c4
-rw-r--r--src/emu/sound/2612intf.c2
-rw-r--r--src/emu/sound/262intf.c2
-rw-r--r--src/emu/sound/3812intf.c6
-rw-r--r--src/emu/sound/5110intf.c9
-rw-r--r--src/emu/sound/5220intf.c4
-rw-r--r--src/emu/sound/aica.c2
-rw-r--r--src/emu/sound/astrocde.c2
-rw-r--r--src/emu/sound/ay8910.c2
-rw-r--r--src/emu/sound/beep.c1
-rw-r--r--src/emu/sound/bsmt2000.c1
-rw-r--r--src/emu/sound/c140.c1
-rw-r--r--src/emu/sound/c352.c2
-rw-r--r--src/emu/sound/c6280.c2
-rw-r--r--src/emu/sound/cdda.c2
-rw-r--r--src/emu/sound/cdp1869.c2
-rw-r--r--src/emu/sound/cem3394.c2
-rw-r--r--src/emu/sound/custom.c2
-rw-r--r--src/emu/sound/dac.c2
-rw-r--r--src/emu/sound/digitalk.c2
-rw-r--r--src/emu/sound/discrete.c1
-rw-r--r--src/emu/sound/dmadac.c2
-rw-r--r--src/emu/sound/es5503.c2
-rw-r--r--src/emu/sound/es5506.c7
-rw-r--r--src/emu/sound/es8712.c3
-rw-r--r--src/emu/sound/flt_rc.c2
-rw-r--r--src/emu/sound/flt_vol.c2
-rw-r--r--src/emu/sound/gaelco.c8
-rw-r--r--src/emu/sound/hc55516.c11
-rw-r--r--src/emu/sound/ics2115.c2
-rw-r--r--src/emu/sound/iremga20.c2
-rw-r--r--src/emu/sound/k005289.c2
-rw-r--r--src/emu/sound/k007232.c2
-rw-r--r--src/emu/sound/k051649.c2
-rw-r--r--src/emu/sound/k053260.c2
-rw-r--r--src/emu/sound/k054539.c1
-rw-r--r--src/emu/sound/msm5205.c3
-rw-r--r--src/emu/sound/msm5232.c1
-rw-r--r--src/emu/sound/multipcm.c2
-rw-r--r--src/emu/sound/n63701x.c2
-rw-r--r--src/emu/sound/namco.c2
-rw-r--r--src/emu/sound/namco52.c2
-rw-r--r--src/emu/sound/nes_apu.c2
-rw-r--r--src/emu/sound/nile.c2
-rw-r--r--src/emu/sound/okim6258.c2
-rw-r--r--src/emu/sound/okim6295.c3
-rw-r--r--src/emu/sound/okim6376.c3
-rw-r--r--src/emu/sound/pokey.c2
-rw-r--r--src/emu/sound/psx.c1
-rw-r--r--src/emu/sound/qsound.c2
-rw-r--r--src/emu/sound/rf5c400.c2
-rw-r--r--src/emu/sound/rf5c68.c1
-rw-r--r--src/emu/sound/s14001a.c2
-rw-r--r--src/emu/sound/saa1099.c2
-rw-r--r--src/emu/sound/samples.c2
-rw-r--r--src/emu/sound/scsp.c2
-rw-r--r--src/emu/sound/segapcm.c2
-rw-r--r--src/emu/sound/sid6581.c1
-rw-r--r--src/emu/sound/sn76477.c2
-rw-r--r--src/emu/sound/sn76496.c16
-rw-r--r--src/emu/sound/snkwave.c2
-rw-r--r--src/emu/sound/sp0250.c2
-rw-r--r--src/emu/sound/sp0256.c2
-rw-r--r--src/emu/sound/speaker.c2
-rw-r--r--src/emu/sound/st0016.c2
-rw-r--r--src/emu/sound/tiaintf.c2
-rw-r--r--src/emu/sound/tms3615.c2
-rw-r--r--src/emu/sound/tms36xx.c2
-rw-r--r--src/emu/sound/upd7759.c2
-rw-r--r--src/emu/sound/vlm5030.c2
-rw-r--r--src/emu/sound/votrax.c2
-rw-r--r--src/emu/sound/vrender0.c2
-rw-r--r--src/emu/sound/wave.c1
-rw-r--r--src/emu/sound/x1_010.c2
-rw-r--r--src/emu/sound/ymf271.c2
-rw-r--r--src/emu/sound/ymf278b.c2
-rw-r--r--src/emu/sound/ymz280b.c3
-rw-r--r--src/emu/timer.c2
-rw-r--r--src/emu/video.c2
-rw-r--r--src/emu/video/cdp1869.c2
-rw-r--r--src/emu/video/mc6845.c18
-rw-r--r--src/emu/video/voodoo.c2
-rw-r--r--src/mame/machine/decocass.c4
-rw-r--r--src/mame/machine/naomibd.c2
121 files changed, 74 insertions, 286 deletions
diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c
index dcc808c0869..d7145ad1a4b 100644
--- a/src/emu/cpuexec.c
+++ b/src/emu/cpuexec.c
@@ -543,8 +543,6 @@ static DEVICE_START( cpu )
/* register some internal states as well */
register_save_states(device);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index 5c763cb032d..e96fc65a6c7 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -21,6 +21,17 @@
#define TEMP_STRING_POOL_ENTRIES 16
#define MAX_STRING_LENGTH 256
+// ->started states
+//
+// Only 0 and 1 are externally visible in practice, making it a
+// boolean //for external users
+
+enum {
+ DEVICE_STOPPED = 0,
+ DEVICE_STARTED = 1,
+ DEVICE_STARTING = 2,
+ DEVICE_DELAYED = 3
+};
/***************************************************************************
@@ -120,7 +131,7 @@ device_config *device_list_add(device_config **listheadptr, const device_config
/* ensure live fields are all cleared */
device->machine = NULL;
- device->started = FALSE;
+ device->started = DEVICE_STOPPED;
device->token = NULL;
device->tokenbytes = 0;
device->region = NULL;
@@ -600,9 +611,18 @@ void device_list_start(running_machine *machine)
device_start_func start = (device_start_func)device_get_info_fct(device, DEVINFO_FCT_START);
assert(start != NULL);
- if (!device->started && (*start)(device) == DEVICE_START_OK)
- device->started = TRUE;
- numstarted += device->started;
+ if (!device->started)
+ {
+ device->started = DEVICE_STARTING;
+ (*start)(device);
+ if (device->started == DEVICE_DELAYED)
+ device->started = DEVICE_STOPPED;
+ else
+ {
+ device->started = DEVICE_STARTED;
+ numstarted ++;
+ }
+ }
}
/* if we didn't start anything new, we're in trouble */
@@ -613,6 +633,17 @@ void device_list_start(running_machine *machine)
/*-------------------------------------------------
+ device_delay_init - delay the startup of a given
+ device for dependency reasons
+-------------------------------------------------*/
+void device_delay_init(const device_config *device)
+{
+ if (device->started != DEVICE_STARTING && device->started != DEVICE_DELAYED)
+ fatalerror("Error: Calling device_delay_init on a device not in the process of starting.");
+ ((device_config *)device)->started = DEVICE_DELAYED;
+}
+
+/*-------------------------------------------------
device_list_stop - stop the configured list
of devices for a machine
-------------------------------------------------*/
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index b7cb0c17ad5..b3a25b9116c 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -37,15 +37,6 @@ enum _device_class
typedef enum _device_class device_class;
-/* device start results */
-enum _device_start_err
-{
- DEVICE_START_OK = 0, /* everything is fine */
- DEVICE_START_MISSING_DEPENDENCY /* at least one device we depend on is not yet started */
-};
-typedef enum _device_start_err device_start_err;
-
-
/* useful in device_list functions for scanning through all devices */
#define DEVICE_TYPE_WILDCARD NULL
@@ -118,7 +109,7 @@ enum
#define DEVICE_SET_INFO_CALL(name) DEVICE_SET_INFO_NAME(name)(device, state, info)
#define DEVICE_START_NAME(name) device_start_##name
-#define DEVICE_START(name) device_start_err DEVICE_START_NAME(name)(const device_config *device)
+#define DEVICE_START(name) void DEVICE_START_NAME(name)(const device_config *device)
#define DEVICE_START_CALL(name) DEVICE_START_NAME(name)(device)
#define DEVICE_STOP_NAME(name) device_stop_##name
@@ -194,7 +185,7 @@ typedef struct _device_config device_config;
/* device interface function types */
typedef void (*device_get_info_func)(const device_config *device, UINT32 state, deviceinfo *info);
typedef void (*device_set_info_func)(const device_config *device, UINT32 state, const deviceinfo *info);
-typedef device_start_err (*device_start_func)(const device_config *device);
+typedef void (*device_start_func)(const device_config *device);
typedef void (*device_stop_func)(const device_config *device);
typedef INT32 (*device_execute_func)(const device_config *device, INT32 clocks);
typedef void (*device_reset_func)(const device_config *device);
@@ -341,6 +332,8 @@ void device_reset(const device_config *device);
/* change the clock on a device */
void device_set_clock(const device_config *device, UINT32 clock);
+/* allow a device to ask for its initialization to be delayed */
+void device_delay_init(const device_config *device);
/* ----- device information getters ----- */
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index 4418111badf..f722bae5d1f 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -233,8 +233,6 @@ static DEVICE_START( via6522 )
/* Default clock is from CPU1 */
if (device->clock == 0)
device_set_clock(device, device->machine->cpu[0]->clock);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index c52a003dbbf..487d1205f30 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -196,7 +196,6 @@ static DEVICE_START( cia )
state_save_register_device_item(device, 0, cia->cnt);
state_save_register_device_item(device, 0, cia->shift);
state_save_register_device_item(device, 0, cia->serial);
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 99591077548..2a5ee74486f 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -462,8 +462,6 @@ static DEVICE_START( riot6532 )
state_save_register_device_item(device, 0, riot->timershift);
state_save_register_device_item(device, 0, riot->timerstate);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/6821new.c b/src/emu/machine/6821new.c
index 6786bb2eedf..10908d0b35b 100644
--- a/src/emu/machine/6821new.c
+++ b/src/emu/machine/6821new.c
@@ -154,8 +154,6 @@ static DEVICE_START( pia )
state_save_register_device_item(device, 0, p->in_cb1_pushed);
state_save_register_device_item(device, 0, p->in_cb2_pushed);
state_save_register_device_item(device, 0, p->out_cb2_needs_pulled);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index b37cd70fb5b..3b35361450a 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -257,7 +257,6 @@ static DEVICE_START( acia6850 )
state_save_register_device_item(device, 0, acia_p->rts);
state_save_register_device_item(device, 0, acia_p->brk);
state_save_register_device_item(device, 0, acia_p->status_read);
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c
index 44143127a16..d9f5e773a53 100644
--- a/src/emu/machine/68681.c
+++ b/src/emu/machine/68681.c
@@ -581,8 +581,6 @@ static DEVICE_START(duart68681)
state_save_register_device_item(device, 0, duart68681->channel[1].tx_enabled);
state_save_register_device_item(device, 0, duart68681->channel[1].tx_data);
state_save_register_device_item(device, 0, duart68681->channel[1].tx_ready);
-
- return DEVICE_START_OK;
}
/*-------------------------------------------------
diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c
index 475281eb5b0..3f4b1f955e1 100644
--- a/src/emu/machine/74123.c
+++ b/src/emu/machine/74123.c
@@ -208,8 +208,6 @@ static DEVICE_START( ttl74123 )
state_save_register_device_item(device, 0, chip->a);
state_save_register_device_item(device, 0, chip->b);
state_save_register_device_item(device, 0, chip->clear);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c
index ebb659aa6f5..2a2aefcc764 100644
--- a/src/emu/machine/8237dma.c
+++ b/src/emu/machine/8237dma.c
@@ -395,8 +395,6 @@ static DEVICE_START( dma8237 ) {
dma8237_t *dma8237 = get_safe_token(device);
dma8237->intf = device->static_config;
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c
index 7e191d61bf4..0928394aef2 100644
--- a/src/emu/machine/8255ppi.c
+++ b/src/emu/machine/8255ppi.c
@@ -534,8 +534,6 @@ static DEVICE_START( ppi8255 ) {
state_save_register_device_item_array(device, 0, ppi8255->out_mask);
state_save_register_device_item_array(device, 0, ppi8255->read);
state_save_register_device_item_array(device, 0, ppi8255->latch);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index e508302fe5b..1415ad65d69 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -384,8 +384,6 @@ static DEVICE_START( dma8257 )
state_save_register_device_item(device, 0, dma8257->msb);
state_save_register_device_item(device, 0, dma8257->drq);
state_save_register_device_item(device, 0, dma8257->status);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index 809f96cef79..23250b500ea 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -155,8 +155,6 @@ static DEVICE_START(at28c16)
state_save_register_device_item( device, 0, c->a9_12v );
state_save_register_device_item( device, 0, c->oe_12v );
state_save_register_device_item( device, 0, c->last_write );
-
- return DEVICE_START_OK;
}
/*-------------------------------------------------
diff --git a/src/emu/machine/cdp1852.c b/src/emu/machine/cdp1852.c
index 404ebdaf7ae..f0292af54e6 100644
--- a/src/emu/machine/cdp1852.c
+++ b/src/emu/machine/cdp1852.c
@@ -152,8 +152,6 @@ static DEVICE_START( cdp1852 )
state_save_register_device_item(device, 0, cdp1852->next_data);
state_save_register_device_item(device, 0, cdp1852->sr);
state_save_register_device_item(device, 0, cdp1852->next_sr);
-
- return DEVICE_START_OK;
}
static DEVICE_RESET( cdp1852 )
diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c
index b89c95ae6a2..020b0685cd0 100644
--- a/src/emu/machine/f3853.c
+++ b/src/emu/machine/f3853.c
@@ -189,8 +189,6 @@ static DEVICE_START( f3853 )
state_save_register_device_item( device, 0, f3853->request_flipflop );
state_save_register_device_item( device, 0, f3853->priority_line );
state_save_register_device_item( device, 0, f3853->external_interrupt_line );
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/i8243.c b/src/emu/machine/i8243.c
index 9f0b9035946..e2e1f6a2b7e 100644
--- a/src/emu/machine/i8243.c
+++ b/src/emu/machine/i8243.c
@@ -142,7 +142,6 @@ WRITE8_DEVICE_HANDLER( i8243_prog_w )
static DEVICE_START( i8243 )
{
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 75df5adf936..1d0012a9b20 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -1752,8 +1752,6 @@ static DEVICE_START( ide_controller )
state_save_register_device_item(device, 0, ide->master_password_enable);
state_save_register_device_item(device, 0, ide->user_password_enable);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c
index 7fd9b840bf2..5cfbc32695b 100644
--- a/src/emu/machine/latch8.c
+++ b/src/emu/machine/latch8.c
@@ -222,8 +222,6 @@ static DEVICE_START( latch8 )
}
state_save_register_device_item(device, 0, latch8->value);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c
index ed09b6359d5..179389d0067 100644
--- a/src/emu/machine/ldcore.c
+++ b/src/emu/machine/ldcore.c
@@ -1455,7 +1455,10 @@ static DEVICE_START( laserdisc )
ld->screen = devtag_get_device(device->machine, VIDEO_SCREEN, config->screen);
assert(ld->screen != NULL);
if (!ld->screen->started)
- return DEVICE_START_MISSING_DEPENDENCY;
+ {
+ device_delay_init(device);
+ return;
+ }
/* save a copy of the device pointer */
ld->device = device;
@@ -1492,8 +1495,6 @@ static DEVICE_START( laserdisc )
/* register callbacks */
config_register(device->machine, "laserdisc", configuration_load, configuration_save);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index 04b2a637ac0..95fea4df497 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -153,8 +153,6 @@ static DEVICE_START( msm6242 )
msm6242->reg[1] = 0;
msm6242->reg[2] = 0;
memset(&msm6242->hold_time, 0, sizeof(mame_system_time));
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index e62b65db9e3..820abae29b0 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -223,8 +223,6 @@ static DEVICE_START( pci_bus )
/* register pci states */
state_save_register_device_item(device, 0, pcibus->address);
state_save_register_device_item(device, 0, pcibus->devicenum);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c
index 494d05e1f0b..2c69b0d97d0 100644
--- a/src/emu/machine/pic8259.c
+++ b/src/emu/machine/pic8259.c
@@ -397,8 +397,6 @@ static DEVICE_START( pic8259 ) {
pic8259->intf = device->static_config;
pic8259->timer = timer_alloc( device->machine, pic8259_timerproc, (void *)device );
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index a09714de099..8493b92bdf4 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -1038,7 +1038,7 @@ void pit8253_set_clock_signal(const device_config *device, int timerno, int stat
}
-static device_start_err common_start( const device_config *device, int device_type ) {
+static void common_start( const device_config *device, int device_type ) {
pit8253_t *pit8253 = get_safe_token(device);
int timerno;
@@ -1077,18 +1077,16 @@ static device_start_err common_start( const device_config *device, int device_ty
state_save_register_device_item(device, timerno, timer->last_updated.attoseconds);
state_save_register_device_item(device, timerno, timer->clock);
}
-
- return DEVICE_START_OK;
}
static DEVICE_START( pit8253 ) {
- return common_start( device, TYPE_PIT8253 );
+ common_start( device, TYPE_PIT8253 );
}
static DEVICE_START( pit8254 ) {
- return common_start( device, TYPE_PIT8254 );
+ common_start( device, TYPE_PIT8254 );
}
diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c
index 0a8c07d56c3..23fe843a811 100644
--- a/src/emu/machine/smc91c9x.c
+++ b/src/emu/machine/smc91c9x.c
@@ -534,8 +534,6 @@ static DEVICE_START( smc91c9x )
state_save_register_device_item_array(device, 0, smc->tx);
state_save_register_device_item(device, 0, smc->sent);
state_save_register_device_item(device, 0, smc->recd);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index 695e04ea3e3..4e44b7d8926 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -330,8 +330,6 @@ static DEVICE_START(timekeeper)
timer = timer_alloc( device->machine, timekeeper_tick, c );
duration = ATTOTIME_IN_SEC(1);
timer_adjust_periodic( timer, duration, 0, duration );
-
- return DEVICE_START_OK;
}
static DEVICE_START(m48t02)
diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c
index 7a30e5f9722..5bdbac00dbf 100644
--- a/src/emu/machine/x2212.c
+++ b/src/emu/machine/x2212.c
@@ -103,8 +103,6 @@ static DEVICE_START(x2212)
state_save_register_device_item_pointer( device, 0, c->e2prom, SIZE_DATA );
state_save_register_device_item( device, 0, c->store );
state_save_register_device_item( device, 0, c->array_recall );
-
- return DEVICE_START_OK;
}
/*-------------------------------------------------
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index 77928b8a5bd..8d23ea097bf 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -494,7 +494,6 @@ static DEVICE_START( z80ctc )
}
astring_free(tempstring);
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index 69ca4b2cb8d..4845343c599 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -466,8 +466,6 @@ static DEVICE_START( z80dma )
state_save_register_device_item(device, 0, z80dma->is_read);
state_save_register_device_item(device, 0, z80dma->cur_cycle);
state_save_register_device_item(device, 0, z80dma->latch);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c
index 1b882908709..a3dd17b3146 100644
--- a/src/emu/machine/z80pio.c
+++ b/src/emu/machine/z80pio.c
@@ -557,8 +557,6 @@ static DEVICE_START( z80pio )
state_save_register_device_item_array(device, 0, z80pio->out);
state_save_register_device_item_array(device, 0, z80pio->strobe);
state_save_register_device_item_array(device, 0, z80pio->int_state);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/machine/z80sio.c b/src/emu/machine/z80sio.c
index 8798783aeb7..6193ad78af7 100644
--- a/src/emu/machine/z80sio.c
+++ b/src/emu/machine/z80sio.c
@@ -798,7 +798,6 @@ static DEVICE_START( z80sio )
sio->receive_poll_cb = intf->receive_poll_cb;
astring_free(tempstring);
- return DEVICE_START_OK;
}
diff --git a/src/emu/sndintrf.h b/src/emu/sndintrf.h
index 755dc3a8fb6..15a38447fba 100644
--- a/src/emu/sndintrf.h
+++ b/src/emu/sndintrf.h
@@ -80,7 +80,7 @@ enum
#define SND_SET_INFO_CALL(name) SND_SET_INFO_NAME(name)(device, state, info)
#define SND_START_NAME(name) snd_start_##name
-#define SND_START(name) device_start_err SND_START_NAME(name)(const device_config *device, int clock)
+#define SND_START(name) void SND_START_NAME(name)(const device_config *device, int clock)
#define SND_START_CALL(name) SND_START_NAME(name)(device, clock)
#define SND_STOP_NAME(name) snd_stop_##name
@@ -103,7 +103,7 @@ typedef union _sndinfo sndinfo;
/* define the various callback functions */
typedef void (*snd_get_info_func)(const device_config *device, UINT32 state, sndinfo *info);
typedef void (*snd_set_info_func)(const device_config *device, UINT32 state, sndinfo *info);
-typedef device_start_err (*snd_start_func)(const device_config *device, int clock);
+typedef void (*snd_start_func)(const device_config *device, int clock);
typedef void (*snd_stop_func)(const device_config *device);
typedef void (*snd_reset_func)(const device_config *device);
diff --git a/src/emu/sound.c b/src/emu/sound.c
index eaa8d640650..a6df8328b38 100644
--- a/src/emu/sound.c
+++ b/src/emu/sound.c
@@ -821,8 +821,6 @@ static DEVICE_START( speaker_output )
/* copy in all the relevant info */
info->speaker = device->inline_config;
info->tag = device->tag;
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c
index d43a26b7003..7f8f1b3b4f3 100644
--- a/src/emu/sound/2151intf.c
+++ b/src/emu/sound/2151intf.c
@@ -56,7 +56,6 @@ static SND_START( ym2151 )
ym2151_set_irq_handler(info->chip,info->intf->irqhandler);
ym2151_set_port_write_handler(info->chip,info->intf->portwritehandler);
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index 1496c157058..209e9657298 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -137,8 +137,6 @@ static SND_START( ym2203 )
assert_always(info->chip != NULL, "Error creating YM2203 chip");
state_save_register_postload(device->machine, ym2203_intf_postload, info);
-
- return DEVICE_START_OK;
}
static SND_STOP( ym2203 )
diff --git a/src/emu/sound/2413intf.c b/src/emu/sound/2413intf.c
index e5670c7d7ff..7d8b634b9c8 100644
--- a/src/emu/sound/2413intf.c
+++ b/src/emu/sound/2413intf.c
@@ -62,8 +62,6 @@ static SND_START( ym2413 )
ym2413_set_update_handler(info->chip, _stream_update, info);
- return DEVICE_START_OK;
-
diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c
index 94ad83f5ea6..517f2f060db 100644
--- a/src/emu/sound/2608intf.c
+++ b/src/emu/sound/2608intf.c
@@ -160,7 +160,6 @@ static SND_START( ym2608 )
assert_always(info->chip != NULL, "Error creating YM2608 chip");
state_save_register_postload(device->machine, ym2608_intf_postload, info);
- return DEVICE_START_OK;
}
static SND_STOP( ym2608 )
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index bd586245950..3c515449ae0 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -169,8 +169,6 @@ static SND_START( ym2610 )
assert_always(info->chip != NULL, "Error creating YM2610 chip");
state_save_register_postload(device->machine, ym2610_intf_postload, info);
-
- return DEVICE_START_OK;
}
#endif
@@ -228,8 +226,6 @@ static SND_START( ym2610b )
pcmbufa,pcmsizea,pcmbufb,pcmsizeb,
timer_handler,IRQHandler,&psgintf);
assert_always(info->chip != NULL, "Error creating YM2610B chip");
-
- return DEVICE_START_OK;
}
#endif
diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c
index fbaf4af4361..aa11a9dcfc9 100644
--- a/src/emu/sound/2612intf.c
+++ b/src/emu/sound/2612intf.c
@@ -109,8 +109,6 @@ static SND_START( ym2612 )
assert_always(info->chip != NULL, "Error creating YM2612 chip");
state_save_register_postload(device->machine, ym2612_intf_postload, info);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c
index 213ed4d2648..bbb3bff6319 100644
--- a/src/emu/sound/262intf.c
+++ b/src/emu/sound/262intf.c
@@ -89,8 +89,6 @@ static SND_START( ymf262 )
info->timer[0] = timer_alloc(device->machine, timer_callback_262_0, info);
info->timer[1] = timer_alloc(device->machine, timer_callback_262_1, info);
-
- return DEVICE_START_OK;
}
static SND_STOP( ymf262 )
diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c
index 8a881a42f8b..07d845dad38 100644
--- a/src/emu/sound/3812intf.c
+++ b/src/emu/sound/3812intf.c
@@ -101,8 +101,6 @@ static SND_START( ym3812 )
info->timer[0] = timer_alloc(device->machine, timer_callback_3812_0, info);
info->timer[1] = timer_alloc(device->machine, timer_callback_3812_1, info);
-
- return DEVICE_START_OK;
}
static SND_STOP( ym3812 )
@@ -268,8 +266,6 @@ static SND_START( ym3526 )
info->timer[0] = timer_alloc(device->machine, timer_callback_3526_0, info);
info->timer[1] = timer_alloc(device->machine, timer_callback_3526_1, info);
-
- return DEVICE_START_OK;
}
static SND_STOP( ym3526 )
@@ -469,8 +465,6 @@ static SND_START( y8950 )
info->timer[0] = timer_alloc(device->machine, timer_callback_8950_0, info);
info->timer[1] = timer_alloc(device->machine, timer_callback_8950_1, info);
-
- return DEVICE_START_OK;
}
static SND_STOP( y8950 )
diff --git a/src/emu/sound/5110intf.c b/src/emu/sound/5110intf.c
index e88f24b5ea9..893973f8dc2 100644
--- a/src/emu/sound/5110intf.c
+++ b/src/emu/sound/5110intf.c
@@ -92,9 +92,6 @@ static SND_START( tms5110 )
/* reset the 5110 */
tms5110_reset_chip(info->chip);
-
- /* request a sound channel */
- return DEVICE_START_OK;
}
static SND_START( tms5100 )
@@ -102,7 +99,6 @@ static SND_START( tms5100 )
struct tms5110_info *info = device->token;
SND_START_CALL( tms5110 );
tms5110_set_variant(info->chip, TMS5110_IS_5100);
- return DEVICE_START_OK;
}
static SND_START( tms5110a )
@@ -110,7 +106,6 @@ static SND_START( tms5110a )
struct tms5110_info *info = device->token;
SND_START_CALL( tms5110 );
tms5110_set_variant(info->chip, TMS5110_IS_5110A);
- return DEVICE_START_OK;
}
static SND_START( cd2801 )
@@ -118,7 +113,6 @@ static SND_START( cd2801 )
struct tms5110_info *info = device->token;
SND_START_CALL( tms5110 );
tms5110_set_variant(info->chip, TMS5110_IS_CD2801);
- return DEVICE_START_OK;
}
static SND_START( tmc0281 )
@@ -126,7 +120,6 @@ static SND_START( tmc0281 )
struct tms5110_info *info = device->token;
SND_START_CALL( tms5110 );
tms5110_set_variant(info->chip, TMS5110_IS_TMC0281);
- return DEVICE_START_OK;
}
static SND_START( cd2802 )
@@ -134,7 +127,6 @@ static SND_START( cd2802 )
struct tms5110_info *info = device->token;
SND_START_CALL( tms5110 );
tms5110_set_variant(info->chip, TMS5110_IS_CD2802);
- return DEVICE_START_OK;
}
static SND_START( m58817 )
@@ -142,7 +134,6 @@ static SND_START( m58817 )
struct tms5110_info *info = device->token;
SND_START_CALL( tms5110 );
tms5110_set_variant(info->chip, TMS5110_IS_M58817);
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/5220intf.c b/src/emu/sound/5220intf.c
index 47d51941d0e..0a24db7dc10 100644
--- a/src/emu/sound/5220intf.c
+++ b/src/emu/sound/5220intf.c
@@ -63,9 +63,6 @@ static SND_START( tms5220 )
tms5220_set_read(info->chip, info->intf->read);
tms5220_set_load_address(info->chip, info->intf->load_address);
tms5220_set_read_and_branch(info->chip, info->intf->read_and_branch);
-
- /* request a sound channel */
- return DEVICE_START_OK;
}
@@ -75,7 +72,6 @@ static SND_START( tms5200 )
struct tms5220_info *info = device->token;
SND_START_CALL( tms5220 );
tms5220_set_variant(info->chip, variant_tmc0285);
- return DEVICE_START_OK;
}
#endif /* (HAS_TMC0285) && (HAS_TMS5200) */
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index 89966aff170..775208445f7 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -1293,8 +1293,6 @@ static SND_START( aica )
AICA->stream = stream_create(device, 0, 2, 44100, AICA, AICA_Update);
}
-
- return DEVICE_START_OK;
}
#ifdef UNUSED_FUNCTION
diff --git a/src/emu/sound/astrocde.c b/src/emu/sound/astrocde.c
index 60b7f598153..6f8481adb0e 100644
--- a/src/emu/sound/astrocde.c
+++ b/src/emu/sound/astrocde.c
@@ -271,8 +271,6 @@ static SND_START( astrocade )
/* reset state */
astrocade_reset(chip);
astrocade_state_save_register(chip, device);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index b6c485e7551..e9a614487d6 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -823,7 +823,6 @@ static SND_START( ay8910 )
};
const ay8910_interface *intf = (device->static_config ? device->static_config : &generic_ay8910);
ay8910_start_ym(device->token, SOUND_AY8910, device, clock, intf);
- return DEVICE_START_OK;
}
static SND_START( ym2149 )
@@ -836,7 +835,6 @@ static SND_START( ym2149 )
};
const ay8910_interface *intf = (device->static_config ? device->static_config : &generic_ay8910);
ay8910_start_ym(device->token, SOUND_YM2149, device, clock, intf);
- return DEVICE_START_OK;
}
static SND_STOP( ay8910 )
diff --git a/src/emu/sound/beep.c b/src/emu/sound/beep.c
index 29a0b1c3f4e..ca07ea59aaf 100644
--- a/src/emu/sound/beep.c
+++ b/src/emu/sound/beep.c
@@ -90,7 +90,6 @@ static SND_START( beep )
pBeep->frequency = 3250;
pBeep->incr = 0;
pBeep->signal = 0x07fff;
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index 325d7d6b596..8a09d46f02d 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -143,7 +143,6 @@ static SND_START( bsmt2000 )
/* reset the chip -- this also configures the default mode */
bsmt2000_reset(chip);
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c
index fcc3a8bb836..d8867e9846e 100644
--- a/src/emu/sound/c140.c
+++ b/src/emu/sound/c140.c
@@ -487,7 +487,6 @@ static SND_START( c140 )
/* allocate a pair of buffers to mix into - 1 second's worth should be more than enough */
info->mixer_buffer_left = auto_malloc(2 * sizeof(INT16)*info->sample_rate );
info->mixer_buffer_right = info->mixer_buffer_left + info->sample_rate;
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c
index dd7d83b684a..d6a8ca6502b 100644
--- a/src/emu/sound/c352.c
+++ b/src/emu/sound/c352.c
@@ -542,8 +542,6 @@ static SND_START( c352 )
info->stream = stream_create(device, 0, 4, info->sample_rate_base, info, c352_update);
c352_init(info, device);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c
index af6e2adebc5..815dc8a9478 100644
--- a/src/emu/sound/c6280.c
+++ b/src/emu/sound/c6280.c
@@ -317,8 +317,6 @@ static SND_START( c6280 )
/* Create stereo stream */
info->stream = stream_create(device, 0, 2, rate, info, c6280_update);
-
- return DEVICE_START_OK;
}
READ8_HANDLER( c6280_r ) { return h6280io_get_buffer((device_config*)space->cpu); }
diff --git a/src/emu/sound/cdda.c b/src/emu/sound/cdda.c
index f9b94b1e99b..347225be67c 100644
--- a/src/emu/sound/cdda.c
+++ b/src/emu/sound/cdda.c
@@ -63,8 +63,6 @@ static SND_START( cdda )
state_save_register_device_item_pointer( device, 0, info->audio_cache, CD_MAX_SECTOR_DATA * MAX_SECTORS );
state_save_register_device_item( device, 0, info->audio_samples );
state_save_register_device_item( device, 0, info->audio_bptr );
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index 5425bde8c87..aca0ba1f882 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -120,8 +120,6 @@ static SND_START( cdp1869 )
info->toneamp = 0;
info->wnfreq = 0;
info->wnamp = 0;
-
- return DEVICE_START_OK;
}
void cdp1869_set_toneamp(int which, int value)
diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c
index 169243ea56c..aa93e5e58cf 100644
--- a/src/emu/sound/cem3394.c
+++ b/src/emu/sound/cem3394.c
@@ -348,8 +348,6 @@ static SND_START( cem3394 )
state_save_register_device_item(device, 0, chip->modulation_depth);
state_save_register_device_item(device, 0, chip->last_ext);
state_save_register_device_item(device, 0, chip->pulse_width);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/custom.c b/src/emu/sound/custom.c
index 74f97357bac..1b6a2a722fe 100644
--- a/src/emu/sound/custom.c
+++ b/src/emu/sound/custom.c
@@ -21,8 +21,6 @@ static SND_START( custom )
info->token = (*info->intf->start)(device, clock, device->static_config);
assert_always(info->token != NULL, "Error starting custom sound");
}
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/dac.c b/src/emu/sound/dac.c
index 8fa5d75d244..2c1509a6b96 100644
--- a/src/emu/sound/dac.c
+++ b/src/emu/sound/dac.c
@@ -109,8 +109,6 @@ static SND_START( dac )
info->output = 0;
state_save_register_device_item(device, 0, info->output);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/digitalk.c b/src/emu/sound/digitalk.c
index 306315e4bfc..01879b7a24c 100644
--- a/src/emu/sound/digitalk.c
+++ b/src/emu/sound/digitalk.c
@@ -652,8 +652,6 @@ static SND_START(digitalker)
digitalker_set_intr(dg, 1);
digitalker_register_for_save(dg);
-
- return DEVICE_START_OK;
}
static SND_SET_INFO(digitalker)
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 284862daeff..b20f6f03027 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -315,7 +315,6 @@ static SND_START( discrete )
setup_disc_logs(info);
discrete_current_context = NULL;
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/dmadac.c b/src/emu/sound/dmadac.c
index c949aa91e7a..ae34b5228c6 100644
--- a/src/emu/sound/dmadac.c
+++ b/src/emu/sound/dmadac.c
@@ -112,8 +112,6 @@ static SND_START( dmadac )
state_save_register_device_item(device, 0, info->enabled);
state_save_register_device_item(device, 0, info->frequency);
state_save_register_device_item_pointer(device, 0, info->buffer, BUFFER_SIZE);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index 80d05b207d6..ead51f6573b 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -264,8 +264,6 @@ static SND_START( es5503 )
chip->output_rate = (clock/8)/34; // (input clock / 8) / # of oscs. enabled + 2
chip->stream = stream_create(device, 0, 2, chip->output_rate, chip, es5503_pcm_update);
-
- return DEVICE_START_OK;
}
READ8_HANDLER(es5503_reg_0_r)
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index 9bbcd9a74a4..7b98a846c0a 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -819,7 +819,7 @@ static STREAM_UPDATE( es5506_update )
***********************************************************************************************/
-static device_start_err es5506_start_common(const device_config *device, int clock, const void *config, sound_type sndtype)
+static void es5506_start_common(const device_config *device, int clock, const void *config, sound_type sndtype)
{
const es5506_interface *intf = config;
struct ES5506Chip *chip = device->token;
@@ -864,13 +864,12 @@ static device_start_err es5506_start_common(const device_config *device, int clo
chip->scratch = auto_malloc(sizeof(chip->scratch[0]) * 2 * MAX_SAMPLE_CHUNK);
/* success */
- return DEVICE_START_OK;
}
static SND_START( es5506 )
{
- return es5506_start_common(device, clock, device->static_config, SOUND_ES5506);
+ es5506_start_common(device, clock, device->static_config, SOUND_ES5506);
}
@@ -1507,7 +1506,7 @@ static SND_START( es5505 )
es5506intf.irq_callback = intf->irq_callback;
es5506intf.read_port = intf->read_port;
- return es5506_start_common(device, clock, &es5506intf, SOUND_ES5505);
+ es5506_start_common(device, clock, &es5506intf, SOUND_ES5505);
}
diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c
index 617af273e00..2bb1aa014ee 100644
--- a/src/emu/sound/es8712.c
+++ b/src/emu/sound/es8712.c
@@ -227,9 +227,6 @@ static SND_START( es8712 )
chip->signal = -2;
es8712_state_save_register(chip, device);
-
- /* success */
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c
index bcb8b16a6fa..ed095e742d6 100644
--- a/src/emu/sound/flt_rc.c
+++ b/src/emu/sound/flt_rc.c
@@ -91,8 +91,6 @@ static SND_START( filter_rc )
set_RC_info(info, conf->type, conf->R1, conf->R2, conf->R3, conf->C);
else
set_RC_info(info, FLT_RC_LOWPASS, 1, 1, 1, 0);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/flt_vol.c b/src/emu/sound/flt_vol.c
index 180111760e2..36fe1c65b29 100644
--- a/src/emu/sound/flt_vol.c
+++ b/src/emu/sound/flt_vol.c
@@ -28,8 +28,6 @@ static SND_START( filter_volume )
info->gain = 0x100;
info->stream = stream_create(device, 1, 1, device->machine->sample_rate, info, filter_volume_update);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/gaelco.c b/src/emu/sound/gaelco.c
index 811b3e2f27f..ea03c086b2e 100644
--- a/src/emu/sound/gaelco.c
+++ b/src/emu/sound/gaelco.c
@@ -242,7 +242,7 @@ WRITE16_HANDLER( gaelcosnd_w )
CG-1V/GAE1 Init
============================================================================*/
-static device_start_err gaelcosnd_start(sound_type sndtype, const device_config *device, int clock)
+static void gaelcosnd_start(sound_type sndtype, const device_config *device, int clock)
{
int j, vol;
const gaelcosnd_interface *intf = device->static_config;
@@ -269,18 +269,16 @@ static device_start_err gaelcosnd_start(sound_type sndtype, const device_config
if (LOG_WAVE)
wavraw = wav_open("gae1_snd.wav", 8000, 2);
-
- return DEVICE_START_OK;
}
static SND_START( gaelco_gae1 )
{
- return gaelcosnd_start(SOUND_GAELCO_GAE1, device, clock);
+ gaelcosnd_start(SOUND_GAELCO_GAE1, device, clock);
}
static SND_START( gaelco_cg1v )
{
- return gaelcosnd_start(SOUND_GAELCO_CG1V, device, clock);
+ gaelcosnd_start(SOUND_GAELCO_CG1V, device, clock);
}
diff --git a/src/emu/sound/hc55516.c b/src/emu/sound/hc55516.c
index 8b414fa018e..1c8115da886 100644
--- a/src/emu/sound/hc55516.c
+++ b/src/emu/sound/hc55516.c
@@ -52,7 +52,7 @@ static STREAM_UPDATE( hc55516_update );
-static device_start_err start_common(const device_config *device, int clock,
+static void start_common(const device_config *device, int clock,
UINT8 _shiftreg_mask, int _active_clock_hi)
{
struct hc55516_data *chip = device->token;
@@ -79,27 +79,24 @@ static device_start_err start_common(const device_config *device, int clock,
state_save_register_device_item(device, 0, chip->update_count);
state_save_register_device_item(device, 0, chip->filter);
state_save_register_device_item(device, 0, chip->integrator);
-
- /* success */
- return DEVICE_START_OK;
}
static SND_START( hc55516 )
{
- return start_common(device, clock, 0x07, TRUE);
+ start_common(device, clock, 0x07, TRUE);
}
static SND_START( mc3417 )
{
- return start_common(device, clock, 0x07, FALSE);
+ start_common(device, clock, 0x07, FALSE);
}
static SND_START( mc3418 )
{
- return start_common(device, clock, 0x0f, FALSE);
+ start_common(device, clock, 0x0f, FALSE);
}
diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c
index 4d8d0ed668b..fc562f9d7dc 100644
--- a/src/emu/sound/ics2115.c
+++ b/src/emu/sound/ics2115.c
@@ -463,8 +463,6 @@ static SND_START( ics2115 )
v = v-33;
chip->ulaw[i] = v;
}
-
- return DEVICE_START_OK;
}
READ8_HANDLER( ics2115_r )
diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c
index a8c5a2d9450..0978b4914ad 100644
--- a/src/emu/sound/iremga20.c
+++ b/src/emu/sound/iremga20.c
@@ -257,8 +257,6 @@ static SND_START( iremga20 )
state_save_register_device_item(device, i, chip->channel[i].effect);
state_save_register_device_item(device, i, chip->channel[i].play);
}
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/k005289.c b/src/emu/sound/k005289.c
index a6a18b0b0ba..94499d9e42f 100644
--- a/src/emu/sound/k005289.c
+++ b/src/emu/sound/k005289.c
@@ -177,8 +177,6 @@ static SND_START( k005289 )
voice[1].volume = 0;
voice[1].wave = &info->sound_prom[0x100];
voice[1].counter = 0;
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c
index 60684513aeb..f506d5d9735 100644
--- a/src/emu/sound/k007232.c
+++ b/src/emu/sound/k007232.c
@@ -326,8 +326,6 @@ static SND_START( k007232 )
info->stream = stream_create(device,0,2,clock/128,info,KDAC_A_update);
KDAC_A_make_fncode(info);
-
- return DEVICE_START_OK;
}
/************************************************/
diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c
index d3808c5d1bd..d89b9b66520 100644
--- a/src/emu/sound/k051649.c
+++ b/src/emu/sound/k051649.c
@@ -139,8 +139,6 @@ static SND_START( k051649 )
/* build the mixer table */
make_mixer_table(info, 5);
-
- return DEVICE_START_OK;
}
static SND_RESET( k051649 )
diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c
index 1e047aced77..1e16477ded4 100644
--- a/src/emu/sound/k053260.c
+++ b/src/emu/sound/k053260.c
@@ -233,8 +233,6 @@ static SND_START( k053260 )
/* setup SH1 timer if necessary */
if ( ic->intf->irq )
timer_pulse( device->machine, attotime_mul(ATTOTIME_IN_HZ(clock), 32), NULL, 0, ic->intf->irq );
-
- return DEVICE_START_OK;
}
INLINE void check_bounds( struct k053260_chip_def *ic, int channel ) {
diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c
index d840fe0aed5..f0c10fbcea3 100644
--- a/src/emu/sound/k054539.c
+++ b/src/emu/sound/k054539.c
@@ -666,7 +666,6 @@ static SND_START( k054539 )
k054539_init_chip(device, info, clock);
state_save_register_postload(device->machine, reset_zones, info);
- return DEVICE_START_OK;
}
WRITE8_HANDLER( k054539_0_w )
diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c
index 14c6a3f193e..b4a051a4e84 100644
--- a/src/emu/sound/msm5205.c
+++ b/src/emu/sound/msm5205.c
@@ -198,9 +198,6 @@ static SND_START( msm5205 )
state_save_register_device_item(device, 0, voice->bitwidth);
state_save_register_device_item(device, 0, voice->signal);
state_save_register_device_item(device, 0, voice->step);
-
- /* success */
- return DEVICE_START_OK;
}
/*
diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c
index d1616b5997f..87f8acf0815 100644
--- a/src/emu/sound/msm5232.c
+++ b/src/emu/sound/msm5232.c
@@ -787,7 +787,6 @@ static SND_START( msm5232 )
msm5232_init(chip, intf, clock, rate);
chip->stream = stream_create(device,0,11,rate,chip,MSM5232_update_one);
- return DEVICE_START_OK;
}
static SND_STOP( msm5232 )
diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c
index 9cc0cdd8d3c..903ce9d9a03 100644
--- a/src/emu/sound/multipcm.c
+++ b/src/emu/sound/multipcm.c
@@ -633,8 +633,6 @@ static SND_START( multipcm )
}
LFO_Init();
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c
index 5c92f467fa7..55df82232c1 100644
--- a/src/emu/sound/n63701x.c
+++ b/src/emu/sound/n63701x.c
@@ -106,8 +106,6 @@ static SND_START( namco_63701x )
chip->rom = device->region;
chip->stream = stream_create(device, 0, 2, clock/1000, chip, namco_63701x_update);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index bb4c2c06d0b..401a7910ef0 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -419,8 +419,6 @@ static SND_START( namco )
state_save_register_device_item(device, voicenum, voice->noise_counter);
state_save_register_device_item(device, voicenum, voice->waveform_select);
}
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/namco52.c b/src/emu/sound/namco52.c
index 81a6a972a55..8c50574627f 100644
--- a/src/emu/sound/namco52.c
+++ b/src/emu/sound/namco52.c
@@ -164,8 +164,6 @@ static SND_START( namco_52xx )
state_save_register_device_item(device, 0, chip->n52_end);
state_save_register_device_item(device, 0, chip->n52_length);
state_save_register_device_item(device, 0, chip->n52_pos);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c
index 0c1c27d0cba..f544bb75c14 100644
--- a/src/emu/sound/nes_apu.c
+++ b/src/emu/sound/nes_apu.c
@@ -748,8 +748,6 @@ static SND_START( nesapu )
#else
state_save_register_device_item(device, 0, info->APU.buf_pos);
#endif
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/nile.c b/src/emu/sound/nile.c
index 459b85fe5e9..d86f0ac4c9d 100644
--- a/src/emu/sound/nile.c
+++ b/src/emu/sound/nile.c
@@ -223,8 +223,6 @@ static SND_START( nile )
info->sound_ram = device->region;
info->stream = stream_create(device, 0, 2, 44100, info, nile_update);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c
index 74f912c3395..b5a3af3f29a 100644
--- a/src/emu/sound/okim6258.c
+++ b/src/emu/sound/okim6258.c
@@ -202,8 +202,6 @@ static SND_START( okim6258 )
info->step = 0;
okim6258_state_save_register(info, device);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index 89e8f231c84..8d120899e7b 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -346,9 +346,6 @@ static SND_START( okim6295 )
}
okim6295_state_save_register(info, device);
-
- /* success */
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c
index 4947e912ba0..8b12c535597 100644
--- a/src/emu/sound/okim6376.c
+++ b/src/emu/sound/okim6376.c
@@ -311,9 +311,6 @@ static SND_START( okim6376 )
}
okim6376_state_save_register(info, device);
-
- /* success */
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c
index 0f409eab3b4..8a0c12f4d7c 100644
--- a/src/emu/sound/pokey.c
+++ b/src/emu/sound/pokey.c
@@ -664,8 +664,6 @@ static SND_START( pokey )
chip->channel = stream_create(device, 0, 1, sample_rate, chip, pokey_update);
register_for_save(chip, device);
-
- return DEVICE_START_OK;
}
static TIMER_CALLBACK( pokey_timer_expire )
diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c
index 800b89b78ff..54284139b25 100644
--- a/src/emu/sound/psx.c
+++ b/src/emu/sound/psx.c
@@ -349,7 +349,6 @@ static SND_START( psxspu )
chip->intf->spu_install_write_handler( 4, spu_write );
chip->stream = stream_create( device, 0, 2, 44100, chip, PSXSPU_update );
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c
index 37f70c57029..49c3911b044 100644
--- a/src/emu/sound/qsound.c
+++ b/src/emu/sound/qsound.c
@@ -145,8 +145,6 @@ static SND_START( qsound )
state_save_register_device_item(device, i, chip->channel[i].lastdt);
state_save_register_device_item(device, i, chip->channel[i].offset);
}
-
- return DEVICE_START_OK;
}
static SND_STOP( qsound )
diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c
index 0f022f8f5bf..d082a75a836 100644
--- a/src/emu/sound/rf5c400.c
+++ b/src/emu/sound/rf5c400.c
@@ -343,8 +343,6 @@ static SND_START( rf5c400 )
struct rf5c400_info *info = device->token;
rf5c400_init_chip(device, info, clock);
-
- return DEVICE_START_OK;
}
/*****************************************************************************/
diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c
index 3db950651dd..5522e605d4c 100644
--- a/src/emu/sound/rf5c68.c
+++ b/src/emu/sound/rf5c68.c
@@ -128,7 +128,6 @@ static SND_START( rf5c68 )
/* allocate the stream */
chip->stream = stream_create(device, 0, 2, clock / 384, chip, rf5c68_update);
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c
index 724ba0357ad..6de40b5c51f 100644
--- a/src/emu/sound/s14001a.c
+++ b/src/emu/sound/s14001a.c
@@ -574,8 +574,6 @@ static SND_START( s14001a )
chip->SpeechRom = device->region;
chip->stream = stream_create(device, 0, 1, clock ? clock : device->machine->sample_rate, chip, s14001a_pcm_update);
-
- return DEVICE_START_OK;
}
static SND_SET_INFO( s14001a )
diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c
index 584316d4411..d7d975264ba 100644
--- a/src/emu/sound/saa1099.c
+++ b/src/emu/sound/saa1099.c
@@ -322,8 +322,6 @@ static SND_START( saa1099 )
/* for each chip allocate one stream */
saa->stream = stream_create(device, 0, 2, saa->sample_rate, saa, saa1099_update);
-
- return DEVICE_START_OK;
}
static void saa1099_control_port_w( int chip, int reg, int data )
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index 0d6b153609c..88cc8411638 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -560,8 +560,6 @@ static SND_START( samples )
/* initialize any custom handlers */
if (intf->start)
(*intf->start)(device);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 40ad912287a..c265bf69f3a 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -1238,8 +1238,6 @@ static SND_START( scsp )
SCSP->stream = stream_create(device, 0, 2, 44100, SCSP, SCSP_Update);
}
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c
index a8a877074e0..0cfd7fe1c3a 100644
--- a/src/emu/sound/segapcm.c
+++ b/src/emu/sound/segapcm.c
@@ -102,8 +102,6 @@ static SND_START( segapcm )
state_save_register_device_item_array(device, 0, spcm->low);
state_save_register_device_item_pointer(device, 0, spcm->ram, 0x800);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c
index a09e9b741d7..65e9645672d 100644
--- a/src/emu/sound/sid6581.c
+++ b/src/emu/sound/sid6581.c
@@ -43,7 +43,6 @@ static device_start_err sid_start(const device_config *device, int clock, SIDTYP
sid6581_init(sid);
sidInitWaveformTables(sidtype);
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c
index 50c13c5033b..9fbf95f9b50 100644
--- a/src/emu/sound/sn76477.c
+++ b/src/emu/sound/sn76477.c
@@ -2451,8 +2451,6 @@ static SND_START( sn76477 )
if (LOG_WAV)
open_wav_file(sn);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c
index bcc71ef2dc6..af6ed2eecb9 100644
--- a/src/emu/sound/sn76496.c
+++ b/src/emu/sound/sn76496.c
@@ -314,7 +314,7 @@ static int SN76496_init(const device_config *device, int clock, struct SN76496 *
}
-static device_start_err generic_start(const device_config *device, int clock, int feedbackmask, int noisetaps, int noiseinvert)
+static void generic_start(const device_config *device, int clock, int feedbackmask, int noisetaps, int noiseinvert)
{
struct SN76496 *chip = device->token;
@@ -334,39 +334,37 @@ static device_start_err generic_start(const device_config *device, int clock, in
state_save_register_device_item_array(device, 0, chip->Period);
state_save_register_device_item_array(device, 0, chip->Count);
state_save_register_device_item_array(device, 0, chip->Output);
-
- return DEVICE_START_OK;
}
static SND_START( sn76489 )
{
- return generic_start(device, clock, 0x4000, 0x03, TRUE);
+ generic_start(device, clock, 0x4000, 0x03, TRUE);
}
static SND_START( sn76489a )
{
- return generic_start(device, clock, 0x8000, 0x06, FALSE);
+ generic_start(device, clock, 0x8000, 0x06, FALSE);
}
static SND_START( sn76494 )
{
- return generic_start(device, clock, 0x8000, 0x06, FALSE);
+ generic_start(device, clock, 0x8000, 0x06, FALSE);
}
static SND_START( sn76496 )
{
- return generic_start(device, clock, 0x8000, 0x06, FALSE);
+ generic_start(device, clock, 0x8000, 0x06, FALSE);
}
static SND_START( gamegear )
{
- return generic_start(device, clock, 0x8000, 0x09, FALSE);
+ generic_start(device, clock, 0x8000, 0x09, FALSE);
}
static SND_START( smsiii )
{
- return generic_start(device, clock, 0x8000, 0x09, FALSE);
+ generic_start(device, clock, 0x8000, 0x09, FALSE);
}
diff --git a/src/emu/sound/snkwave.c b/src/emu/sound/snkwave.c
index 30276dbed20..c38208df1e3 100644
--- a/src/emu/sound/snkwave.c
+++ b/src/emu/sound/snkwave.c
@@ -124,8 +124,6 @@ static SND_START( snkwave )
state_save_register_device_item(device, 0, chip->counter);
state_save_register_device_item(device, 0, chip->waveform_position);
state_save_register_device_item_pointer(device, 0, chip->waveform, WAVEFORM_LENGTH);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/sp0250.c b/src/emu/sound/sp0250.c
index 0fae88116fe..b4d4d803403 100644
--- a/src/emu/sound/sp0250.c
+++ b/src/emu/sound/sp0250.c
@@ -206,8 +206,6 @@ static SND_START( sp0250 )
}
sp->stream = stream_create(device, 0, 1, clock / CLOCK_DIVIDER, sp, sp0250_update);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c
index cb9bc84bce8..3e2f505a2cf 100644
--- a/src/emu/sound/sp0256.c
+++ b/src/emu/sound/sp0256.c
@@ -1207,8 +1207,6 @@ static SND_START( sp0256 )
/* -------------------------------------------------------------------- */
sp->rom = device->region;
sp0256_bitrevbuff(sp->rom, 0, 0xffff);
-
- return DEVICE_START_OK;
}
static SND_STOP( sp0256 )
diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c
index 3f5855be784..8c7074ce74b 100644
--- a/src/emu/sound/speaker.c
+++ b/src/emu/sound/speaker.c
@@ -43,8 +43,6 @@ static SND_START( speaker )
sp->num_levels = 2;
sp->levels = default_levels;
sp->level = 0;
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c
index e4de20774c5..ac0cf140cd6 100644
--- a/src/emu/sound/st0016.c
+++ b/src/emu/sound/st0016.c
@@ -132,8 +132,6 @@ static SND_START( st0016 )
info->sound_ram = intf->p_soundram;
info->stream = stream_create(device, 0, 2, 44100, info, st0016_update);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/tiaintf.c b/src/emu/sound/tiaintf.c
index 3cbaea8759e..85b0140e9ca 100644
--- a/src/emu/sound/tiaintf.c
+++ b/src/emu/sound/tiaintf.c
@@ -25,8 +25,6 @@ static SND_START( tia )
info->chip = tia_sound_init(clock, clock, 16);
assert_always(info->chip != NULL, "Error creating TIA chip");
-
- return DEVICE_START_OK;
}
static SND_STOP( tia )
diff --git a/src/emu/sound/tms3615.c b/src/emu/sound/tms3615.c
index c1da3f9fb7f..0eb4eb89d2f 100644
--- a/src/emu/sound/tms3615.c
+++ b/src/emu/sound/tms3615.c
@@ -84,8 +84,6 @@ static SND_START( tms3615 )
tms->channel = stream_create(device, 0, 2, clock/8, tms, tms3615_sound_update);
tms->samplerate = clock/8;
tms->basefreq = clock;
-
- return DEVICE_START_OK;
}
/**************************************************************************
diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c
index 78d46b4bf4a..f1a88d70e43 100644
--- a/src/emu/sound/tms36xx.c
+++ b/src/emu/sound/tms36xx.c
@@ -514,8 +514,6 @@ static SND_START( tms36xx )
tms->decay[0], tms->decay[1], tms->decay[2],
tms->decay[3], tms->decay[4], tms->decay[5]));
LOG(("TMS36xx speed %d\n", tms->speed));
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c
index fd14c537660..9e6aa341514 100644
--- a/src/emu/sound/upd7759.c
+++ b/src/emu/sound/upd7759.c
@@ -662,8 +662,6 @@ static SND_START( upd7759 )
upd7759_reset(chip);
register_for_save(chip, device);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c
index 4ffa47d3d83..6adc7f1b5db 100644
--- a/src/emu/sound/vlm5030.c
+++ b/src/emu/sound/vlm5030.c
@@ -686,8 +686,6 @@ static SND_START( vlm5030 )
state_save_register_device_item_array(device,0,chip->target_k);
state_save_register_device_item_array(device,0,chip->x);
state_save_register_postload(device->machine, vlm5030_restore_state, chip);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/votrax.c b/src/emu/sound/votrax.c
index eb0785af77d..6b19ca8d8ba 100644
--- a/src/emu/sound/votrax.c
+++ b/src/emu/sound/votrax.c
@@ -114,8 +114,6 @@ static SND_START( votrax )
votrax->sample = NULL;
votrax->step = 0;
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c
index e0c602783b9..7f55f747aaa 100644
--- a/src/emu/sound/vrender0.c
+++ b/src/emu/sound/vrender0.c
@@ -105,8 +105,6 @@ static SND_START( vrender0 )
memset(VR0->SOUNDREGS,0,sizeof(VR0->SOUNDREGS));
VR0->stream = stream_create(device, 0, 2, 44100, VR0, VR0_Update);
-
- return DEVICE_START_OK;
}
WRITE32_HANDLER(vr0_snd_write)
diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c
index 759751a1ac9..b1f8f7dea27 100644
--- a/src/emu/sound/wave.c
+++ b/src/emu/sound/wave.c
@@ -63,7 +63,6 @@ static SND_START( wave )
image = device_list_find_by_tag( device->machine->config->devicelist, CASSETTE, device->tag );
#endif
stream_create(device, 0, 1, device->machine->sample_rate, (void *)image, wave_sound_update);
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 86373cc5125..6c92b74bd28 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -211,8 +211,6 @@ static SND_START( x1_010 )
/* get stream channels */
info->stream = stream_create(device,0,2,info->rate,info,seta_update);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c
index 10c8f4335fb..b28c37feb5d 100644
--- a/src/emu/sound/ymf271.c
+++ b/src/emu/sound/ymf271.c
@@ -1767,8 +1767,6 @@ static SND_START( ymf271 )
double db = 0.75 * (double)i;
total_level[i] = (int)(65536.0 / pow(10.0, db / 20.0));
}
-
- return DEVICE_START_OK;
}
READ8_HANDLER( ymf271_0_r )
diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c
index 00f7a90647f..e080342758e 100644
--- a/src/emu/sound/ymf278b.c
+++ b/src/emu/sound/ymf278b.c
@@ -694,8 +694,6 @@ static SND_START( ymf278b )
for(i=0; i<7; i++)
chip->mix_level[i] = chip->volume[8*i+8];
chip->mix_level[7] = 0;
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 6232f638cb9..4539b8d7e61 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -694,9 +694,6 @@ static SND_START( ymz280b )
#if MAKE_WAVS
chip->wavresample = wav_open("resamp.wav", INTERNAL_SAMPLE_RATE, 2);
#endif
-
- /* success */
- return DEVICE_START_OK;
}
diff --git a/src/emu/timer.c b/src/emu/timer.c
index 00df5405eed..c94bc45dc69 100644
--- a/src/emu/timer.c
+++ b/src/emu/timer.c
@@ -1269,8 +1269,6 @@ static DEVICE_START( timer )
fatalerror("Unknown timer device type");
break;
}
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/video.c b/src/emu/video.c
index 64ae41af1d7..31c3f8f30b2 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -1264,8 +1264,6 @@ static DEVICE_START( video_screen )
state_save_register_device_item(screen, 0, state->vblank_end_time.attoseconds);
state_save_register_device_item(screen, 0, state->frame_number);
state_save_register_postload(device->machine, video_screen_postload, (void *)device);
-
- return DEVICE_START_OK;
}
diff --git a/src/emu/video/cdp1869.c b/src/emu/video/cdp1869.c
index a7099da3201..71175e63ea5 100644
--- a/src/emu/video/cdp1869.c
+++ b/src/emu/video/cdp1869.c
@@ -844,8 +844,6 @@ static DEVICE_START( cdp1869 )
state_save_register_device_item(device, 0, cdp1869->toneamp);
state_save_register_device_item(device, 0, cdp1869->wnfreq);
state_save_register_device_item(device, 0, cdp1869->wnamp);
-
- return DEVICE_START_OK;
}
static DEVICE_SET_INFO( cdp1869 )
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 67f5bc3f19d..155876174b8 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -738,7 +738,7 @@ void mc6845_update(const device_config *device, bitmap_t *bitmap, const rectangl
/* device interface */
-static device_start_err common_start(const device_config *device, int device_type)
+static void common_start(const device_config *device, int device_type)
{
mc6845_t *mc6845 = get_safe_token(device);
@@ -806,43 +806,41 @@ static device_start_err common_start(const device_config *device, int device_typ
state_save_register_device_item(device, 0, mc6845->cursor_state);
state_save_register_device_item(device, 0, mc6845->cursor_blink_count);
state_save_register_device_item(device, 0, mc6845->update_addr);
-
- return DEVICE_START_OK;
}
static DEVICE_START( mc6845 )
{
- return common_start(device, TYPE_MC6845);
+ common_start(device, TYPE_MC6845);
}
static DEVICE_START( mc6845_1 )
{
- return common_start(device, TYPE_MC6845_1);
+ common_start(device, TYPE_MC6845_1);
}
static DEVICE_START( c6545_1 )
{
- return common_start(device, TYPE_C6545_1);
+ common_start(device, TYPE_C6545_1);
}
static DEVICE_START( r6545_1 )
{
- return common_start(device, TYPE_R6545_1);
+ common_start(device, TYPE_R6545_1);
}
static DEVICE_START( h46505 )
{
- return common_start(device, TYPE_H46505);
+ common_start(device, TYPE_H46505);
}
static DEVICE_START( hd6845 )
{
- return common_start(device, TYPE_HD6845);
+ common_start(device, TYPE_HD6845);
}
static DEVICE_START( sy6545_1 )
{
- return common_start(device, TYPE_SY6545_1);
+ common_start(device, TYPE_SY6545_1);
}
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index bf18f0432b0..504312ab2fc 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -4614,8 +4614,6 @@ static DEVICE_START( voodoo )
/* register for save states */
init_save_state(device);
-
- return DEVICE_START_OK;
}
diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c
index 49ed408bc3e..9f0d107434a 100644
--- a/src/mame/machine/decocass.c
+++ b/src/mame/machine/decocass.c
@@ -2128,7 +2128,7 @@ static DEVICE_START( decocass_tape )
/* fetch the data pointer */
tape->timer = timer_alloc(device->machine, tape_clock_callback, (void *)device);
if (device->region == NULL)
- return DEVICE_START_OK;
+ return;
/* scan for the first non-empty block in the image */
for (offs = device->regionbytes - 1; offs >= 0; offs--)
@@ -2161,8 +2161,6 @@ static DEVICE_START( decocass_tape )
state_save_register_device_item(device, 0, tape->speed);
state_save_register_device_item(device, 0, tape->bitnum);
state_save_register_device_item(device, 0, tape->clockpos);
-
- return DEVICE_START_OK;
}
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index 2c110a7357d..e2977371f33 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -538,8 +538,6 @@ static DEVICE_START( naomibd )
/* register for save states */
init_save_state(device);
-
- return DEVICE_START_OK;
}