diff options
author | Aaron Giles <aaron@aarongiles.com> | 2008-02-20 06:08:30 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2008-02-20 06:08:30 +0000 |
commit | 85112f6f1cad0018486b35a39e508b9cba6b47ff (patch) | |
tree | 8bb30257c535ed4ee13ba51d7264ffd940bb9fac | |
parent | 99675196a810f0b422ec51f000024358e6041946 (diff) |
Removed clock and flags as fundamental device parameters.
-rw-r--r-- | src/emu/devintrf.c | 4 | ||||
-rw-r--r-- | src/emu/devintrf.h | 2 | ||||
-rw-r--r-- | src/emu/mconfig.h | 6 | ||||
-rw-r--r-- | src/emu/video/mc6845.c | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index 89f0a30cc0b..0ce3650ec4d 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -92,8 +92,6 @@ device_config *device_list_add(device_config **listheadptr, device_type type, co /* populate all fields */ device->next = NULL; device->type = type; - device->flags = 0; - device->clock = 0; device->static_config = NULL; device->inline_config = (info.i == 0) ? NULL : (device->tag + strlen(tag) + 1); device->token = NULL; @@ -222,7 +220,7 @@ void device_list_start(running_machine *machine) assert(config->start != NULL); /* call the start function */ - config->token = (*config->start)(machine, config->clock, config->flags, config->static_config, config->inline_config); + config->token = (*config->start)(machine, config->static_config, config->inline_config); assert(config->token != NULL); /* fatal error if this fails */ diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index 1da839984de..b8d8bae6e93 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -79,7 +79,7 @@ typedef union _deviceinfo deviceinfo; /* device interface function types */ typedef void (*device_get_info_func)(running_machine *machine, void *token, UINT32 state, deviceinfo *info); typedef void (*device_set_info_func)(running_machine *machine, void *token, UINT32 state, const deviceinfo *info); -typedef void *(*device_start_func)(running_machine *machine, UINT32 clock, UINT32 flags, const void *static_config, const void *inline_config); +typedef void *(*device_start_func)(running_machine *machine, const void *static_config, const void *inline_config); typedef void (*device_stop_func)(running_machine *machine, void *token); typedef void (*device_reset_func)(running_machine *machine, void *token); diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index e040b86f8b0..e6f1ce0e262 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -378,12 +378,6 @@ struct _machine_config #define MDRV_DEVICE_MODIFY(_tag, _type) \ device = device_list_find_by_tag(&machine->devicelist, _type, _tag);\ -#define MDRV_DEVICE_CLOCK(_clock) \ - device->clock = (_clock); \ - -#define MDRV_DEVICE_FLAGS(_flags) \ - device->flags = (_flags); \ - #define MDRV_DEVICE_CONFIG(_config) \ device->static_config = &(_config); \ diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c index 3885aafffb3..fe5f8f59c6d 100644 --- a/src/emu/video/mc6845.c +++ b/src/emu/video/mc6845.c @@ -445,7 +445,7 @@ void mc6845_update(mc6845_t *mc6845, mame_bitmap *bitmap, const rectangle *clipr /* device interface */ -static void *mc6845_start(running_machine *machine, UINT32 clock, UINT32 flags, const void *static_config, const void *inline_config) +static void *mc6845_start(running_machine *machine, const void *static_config, const void *inline_config) { return mc6845_config(static_config); } |