Region classes go bye-bye.

src/emu/cheat.c

@@ -13376,7 +13376,7 @@ static void build_cpu_region_info_list(running_machine *machine)
 				UINT8 region_type = ROMREGION_GETTYPE(traverse);
 
 				/* non-cpu region */
-				if(region_type >= RGNCLASS_GFX, "gfx1" && region_type <= REGION_PLDS)
+				if(region_type >= "gfx1" && region_type <= REGION_PLDS)
 				{
 					UINT8	bit_state		= 0;
 					UINT32	length			= memory_region_length(machine, region_type);

src/emu/cpu/mb86233/mb86233.c

@@ -133,7 +133,7 @@ static void mb86233_init(int index, int clock, const void *config, int (*irqcall
 	memset( mb86233.RAM, 0, 2 * 0x200 * sizeof(UINT32) );
 	mb86233.ARAM = &mb86233.RAM[0];
 	mb86233.BRAM = &mb86233.RAM[0x200];
-	mb86233.Tables = (UINT32*) memory_region(Machine, RGNCLASS_USER, _config->tablergn);
+	mb86233.Tables = (UINT32*) memory_region(Machine, _config->tablergn);
 
 	state_save_register_global_pointer(mb86233.RAM,2 * 0x200 * sizeof(UINT32));
 }

src/emu/debug/debugcpu.c

@@ -101,12 +101,12 @@ static void check_hotspots(int cpunum, int spacenum, offs_t address);
 static UINT64 expression_read_memory(const char *name, int space, UINT32 address, int size);
 static UINT64 expression_read_address_space(int cpuindex, int space, offs_t address, int size);
 static UINT64 expression_read_program_direct(int cpuindex, int opcode, offs_t address, int size);
-static UINT64 expression_read_memory_region(int rgnclass, const char *rgntag, offs_t address, int size);
+static UINT64 expression_read_memory_region(const char *rgntag, offs_t address, int size);
 static UINT64 expression_read_eeprom(offs_t address, int size);
 static void expression_write_memory(const char *name, int space, UINT32 address, int size, UINT64 data);
 static void expression_write_address_space(int cpuindex, int space, offs_t address, int size, UINT64 data);
 static void expression_write_program_direct(int cpuindex, int opcode, offs_t address, int size, UINT64 data);
-static void expression_write_memory_region(int rgnclass, const char *rgntag, offs_t address, int size, UINT64 data);
+static void expression_write_memory_region(const char *rgntag, offs_t address, int size, UINT64 data);
 static void expression_write_eeprom(offs_t address, int size, UINT64 data);
 
 /* variable getters/setters */
@@ -2163,25 +2163,10 @@ static UINT64 expression_read_memory(const char *name, int space, UINT32 address
 		case EXPSPACE_EEPROM:
 			return expression_read_eeprom(address, size);
 
-		case EXPSPACE_CPU:
+		case EXPSPACE_REGION:
 			if (name == NULL)
 				break;
-			return expression_read_memory_region(RGNCLASS_CPU, name, address, size);
+			return expression_read_memory_region(name, address, size);
-
-		case EXPSPACE_USER:
-			if (name == NULL)
-				break;
-			return expression_read_memory_region(RGNCLASS_USER, name, address, size);
-
-		case EXPSPACE_GFX:
-			if (name == NULL)
-				break;
-			return expression_read_memory_region(RGNCLASS_GFX, name, address, size);
-
-		case EXPSPACE_SOUND:
-			if (name == NULL)
-				break;
-			return expression_read_memory_region(RGNCLASS_SOUND, name, address, size);
 	}
 	return ~(UINT64)0 >> (64 - 8*size);
 }
@@ -2284,16 +2269,16 @@ static UINT64 expression_read_program_direct(int cpuindex, int opcode, offs_t ad
     from a memory region
 -------------------------------------------------*/
 
-static UINT64 expression_read_memory_region(int rgnclass, const char *rgntag, offs_t address, int size)
+static UINT64 expression_read_memory_region(const char *rgntag, offs_t address, int size)
 {
-	UINT8 *base = memory_region(Machine, rgnclass, rgntag);
+	UINT8 *base = memory_region(Machine, rgntag);
 	UINT64 result = ~(UINT64)0 >> (64 - 8*size);
 
 	/* make sure we get a valid base before proceeding */
 	if (base != NULL)
 	{
-		UINT32 length = memory_region_length(Machine, rgnclass, rgntag);
+		UINT32 length = memory_region_length(Machine, rgntag);
-		UINT32 flags = memory_region_flags(Machine, rgnclass, rgntag);
+		UINT32 flags = memory_region_flags(Machine, rgntag);
 
 		/* call ourself recursively until we are byte-sized */
 		if (size > 1)
@@ -2302,8 +2287,8 @@ static UINT64 expression_read_memory_region(int rgnclass, const char *rgntag, of
 			UINT64 r0, r1;
 
 			/* read each half, from lower address to upper address */
-			r0 = expression_read_memory_region(rgnclass, rgntag, address + 0, halfsize);
+			r0 = expression_read_memory_region(rgntag, address + 0, halfsize);
-			r1 = expression_read_memory_region(rgnclass, rgntag, address + halfsize, halfsize);
+			r1 = expression_read_memory_region(rgntag, address + halfsize, halfsize);
 
 			/* assemble based on the target endianness */
 			if ((flags & ROMREGION_ENDIANMASK) == ROMREGION_LE)
@@ -2388,28 +2373,10 @@ static void expression_write_memory(const char *name, int space, UINT32 address,
 			expression_write_eeprom(address, size, data);
 			break;
 
-		case EXPSPACE_CPU:
+		case EXPSPACE_REGION:
 			if (name == NULL)
 				break;
-			expression_write_memory_region(RGNCLASS_CPU, name, address, size, data);
+			expression_write_memory_region(name, address, size, data);
-			break;
-			 
-		case EXPSPACE_USER:
-			if (name == NULL)
-				break;
-			expression_write_memory_region(RGNCLASS_USER, name, address, size, data);
-			break;
-			 
-		case EXPSPACE_GFX:
-			if (name == NULL)
-				break;
-			expression_write_memory_region(RGNCLASS_GFX, name, address, size, data);
-			break;
-			 
-		case EXPSPACE_SOUND:
-			if (name == NULL)
-				break;
-			expression_write_memory_region(RGNCLASS_SOUND, name, address, size, data);
 			break;
 	}
 }
@@ -2516,15 +2483,15 @@ static void expression_write_program_direct(int cpuindex, int opcode, offs_t add
     from a memory region
 -------------------------------------------------*/
 
-static void expression_write_memory_region(int rgnclass, const char *rgntag, offs_t address, int size, UINT64 data)
+static void expression_write_memory_region(const char *rgntag, offs_t address, int size, UINT64 data)
 {
-	UINT8 *base = memory_region(Machine, rgnclass, rgntag);
+	UINT8 *base = memory_region(Machine, rgntag);
 
 	/* make sure we get a valid base before proceeding */
 	if (base != NULL)
 	{
-		UINT32 length = memory_region_length(Machine, rgnclass, rgntag);
+		UINT32 length = memory_region_length(Machine, rgntag);
-		UINT32 flags = memory_region_flags(Machine, rgnclass, rgntag);
+		UINT32 flags = memory_region_flags(Machine, rgntag);
 
 		/* call ourself recursively until we are byte-sized */
 		if (size > 1)
@@ -2546,8 +2513,8 @@ static void expression_write_memory_region(int rgnclass, const char *rgntag, off
 			}
 
 			/* write each half, from lower address to upper address */
-			expression_write_memory_region(rgnclass, rgntag, address + 0, halfsize, r0);
+			expression_write_memory_region(rgntag, address + 0, halfsize, r0);
-			expression_write_memory_region(rgnclass, rgntag, address + halfsize, halfsize, r1);
+			expression_write_memory_region(rgntag, address + halfsize, halfsize, r1);
 		}
 
 		/* only process if we're within range */

src/emu/debug/debugvw.c

@@ -2380,7 +2380,7 @@ static void memory_write_byte(debug_view_memory *memdata, offs_t offs, UINT8 dat
 
 /* hack for FD1094 editing */
 #ifdef FD1094_HACK
-	if (memdata->raw_base == memory_region(machine, RGNCLASS_USER, "user2"))
+	if (memdata->raw_base == memory_region(machine, "user2"))
 	{
 		extern void fd1094_regenerate_key(void);
 		fd1094_regenerate_key();

src/emu/debug/express.c

@@ -87,10 +87,7 @@ enum
 	TIN_MEMORY_OPCODE		= (EXPSPACE_OPCODE    << TIN_MEMORY_SPACE_SHIFT),
 	TIN_MEMORY_RAMWRITE		= (EXPSPACE_RAMWRITE  << TIN_MEMORY_SPACE_SHIFT),
 	TIN_MEMORY_EEPROM		= (EXPSPACE_EEPROM	  << TIN_MEMORY_SPACE_SHIFT),
-	TIN_MEMORY_CPU			= (EXPSPACE_CPU       << TIN_MEMORY_SPACE_SHIFT),
+	TIN_MEMORY_REGION		= (EXPSPACE_REGION    << TIN_MEMORY_SPACE_SHIFT),
-	TIN_MEMORY_USER			= (EXPSPACE_USER      << TIN_MEMORY_SPACE_SHIFT),
-	TIN_MEMORY_GFX			= (EXPSPACE_GFX       << TIN_MEMORY_SPACE_SHIFT),
-	TIN_MEMORY_SOUND		= (EXPSPACE_SOUND     << TIN_MEMORY_SPACE_SHIFT),
 
 	TIN_MEMORY_INDEX_SHIFT	= 16,
 	TIN_MEMORY_INDEX_MASK	= (0xffff << TIN_MEMORY_INDEX_SHIFT)
@@ -565,10 +562,7 @@ static int parse_memory_operator(parsed_expression *expr, const char *buffer, to
 		case 'o':	*flags |= TIN_MEMORY_OPCODE;	break;
 		case 'r':	*flags |= TIN_MEMORY_RAMWRITE;	break;
 		case 'e':	*flags |= TIN_MEMORY_EEPROM;	break;
-		case 'c':	*flags |= TIN_MEMORY_CPU;		break;
+		case 'g':	*flags |= TIN_MEMORY_REGION;	break;
-		case 'u':	*flags |= TIN_MEMORY_USER;		break;
-		case 'g':	*flags |= TIN_MEMORY_GFX;		break;
-		case 's':	*flags |= TIN_MEMORY_SOUND;		break;
 		default:	return 0;
 	}
 

src/emu/debug/express.h

@@ -48,10 +48,7 @@
 #define EXPSPACE_OPCODE						(3)
 #define EXPSPACE_RAMWRITE					(4)
 #define EXPSPACE_EEPROM						(5)
-#define EXPSPACE_CPU						(6)
+#define EXPSPACE_REGION						(6)
-#define EXPSPACE_USER						(7)
-#define EXPSPACE_GFX						(8)
-#define EXPSPACE_SOUND						(9)
 
 
 

src/emu/drawgfx.h

@@ -149,7 +149,7 @@ struct _gfx_element
 typedef struct _gfx_decode_entry gfx_decode_entry;
 struct _gfx_decode_entry
 {
-	const char *	memory_region;		/* RGNCLASS_GFX memory region where the data resides */
+	const char *	memory_region;		/* memory region where the data resides */
 	UINT32 			start;				/* offset of beginning of data to decode */
 	const gfx_layout *gfxlayout;		/* pointer to gfx_layout describing the layout; NULL marks the end of the array */
 	UINT16 			color_codes_start;	/* offset in the color lookup table where color codes start */

src/emu/drivers/empty.c

@@ -54,7 +54,7 @@ MACHINE_DRIVER_END
  *************************************/
 
 ROM_START( empty )
-	ROM_REGION( 0x10, RGNCLASS_USER, "user1", 0 )
+	ROM_REGION( 0x10, "user1", 0 )
 ROM_END
 
 

src/emu/info.c

@@ -460,7 +460,7 @@ static void print_game_rom(FILE *out, const game_driver *game)
 				}
 
 				/* append a region name */
-				fprintf(out, " regionclass=\"%s\" regiontag=\"%s\"", memory_region_class_name(ROMREGION_GETCLASS(region), TRUE), ROMREGION_GETTAG(region));
+				fprintf(out, " region=\"%s\"", ROMREGION_GETTAG(region));
 
 				/* add nodump/baddump flags */
 				if (hash_data_has_info(ROM_GETHASHDATA(rom), HASH_INFO_NO_DUMP))
@@ -906,8 +906,7 @@ void print_mame_xml(FILE *out, const game_driver *const games[], const char *gam
 		"\t\t\t<!ATTLIST rom md5 CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST rom sha1 CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST rom merge CDATA #IMPLIED>\n"
-		"\t\t\t<!ATTLIST rom regionclass CDATA #IMPLIED>\n"
+		"\t\t\t<!ATTLIST rom region CDATA #IMPLIED>\n"
-		"\t\t\t<!ATTLIST rom regiontag CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST rom offset CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST rom status (baddump|nodump|good) \"good\">\n"
 		"\t\t\t<!ATTLIST rom dispose (yes|no) \"no\">\n"
@@ -916,8 +915,7 @@ void print_mame_xml(FILE *out, const game_driver *const games[], const char *gam
 		"\t\t\t<!ATTLIST disk md5 CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST disk sha1 CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST disk merge CDATA #IMPLIED>\n"
-		"\t\t\t<!ATTLIST disk regionclass CDATA #IMPLIED>\n"
+		"\t\t\t<!ATTLIST disk region CDATA #IMPLIED>\n"
-		"\t\t\t<!ATTLIST disk regiontag CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST disk index CDATA #IMPLIED>\n"
 		"\t\t\t<!ATTLIST disk status (baddump|nodump|good) \"good\">\n"
 		"\t\t<!ELEMENT sample EMPTY>\n"

src/emu/machine/rp5h01.c

@@ -41,7 +41,7 @@ int RP5H01_init( const struct RP5H01_interface *interface ) {
 	for( i = 0; i < intf->num; i++ ) {
 		RP5H01_state[i].counter = 0;
 		RP5H01_state[i].counter_mode = COUNTER_MODE_6_BITS;
-		RP5H01_state[i].data = &( memory_region( Machine, RGNCLASS_USER, intf->region[i] )[ intf->offset[i] ] );
+		RP5H01_state[i].data = &( memory_region( Machine, intf->region[i] )[ intf->offset[i] ] );
 		RP5H01_state[i].enabled = 0;
 		RP5H01_state[i].old_reset = -1;
 		RP5H01_state[i].old_clock = -1;

src/emu/mame.c

@@ -163,7 +163,7 @@ struct _mame_private
 	attotime		saveload_schedule_time;
 
 	/* array of memory regions */
-	region_info	*	regions[RGNCLASS_COUNT];
+	region_info	*	regions;
 
 	/* error recovery and exiting */
 	jmp_buf			fatal_error_jmpbuf;
@@ -759,27 +759,25 @@ int mame_is_paused(running_machine *machine)
     region
 -------------------------------------------------*/
 
-UINT8 *memory_region_alloc(running_machine *machine, int rgnclass, const char *name, UINT32 length, UINT32 flags)
+UINT8 *memory_region_alloc(running_machine *machine, const char *name, UINT32 length, UINT32 flags)
 {
 	mame_private *mame = machine->mame_data;
 	region_info *info;
     
-    assert(rgnclass < RGNCLASS_COUNT);
-
     /* make sure we don't have a region of the same name */
-    for (info = mame->regions[rgnclass]; info != NULL; info = info->next)
+    for (info = mame->regions; info != NULL; info = info->next)
     	if (astring_cmpc(info->name, name) == 0)
-    		fatalerror("memory_region_alloc called with duplicate region type %d name \"%s\"\n", rgnclass, name);
+    		fatalerror("memory_region_alloc called with duplicate region name \"%s\"\n", name);
 
 	/* allocate the region */
 	info = malloc_or_die(sizeof(*info) + length);
-	info->next = mame->regions[rgnclass];
+	info->next = mame->regions;
 	info->name = astring_dupc(name);
 	info->length = length;
 	info->flags = flags;
 	
 	/* hook us into the list */
-	mame->regions[rgnclass] = info;
+	mame->regions = info;
 	return info->base;
 }
 
@@ -789,15 +787,13 @@ UINT8 *memory_region_alloc(running_machine *machine, int rgnclass, const char *n
     region
 -------------------------------------------------*/
 
-void memory_region_free(running_machine *machine, int rgnclass, const char *name)
+void memory_region_free(running_machine *machine, const char *name)
 {
 	mame_private *mame = machine->mame_data;
 	region_info **infoptr;
 	
-    assert(rgnclass < RGNCLASS_COUNT);
-
 	/* find the region */
-	for (infoptr = &mame->regions[rgnclass]; *infoptr != NULL; infoptr = &(*infoptr)->next)
+	for (infoptr = &mame->regions; *infoptr != NULL; infoptr = &(*infoptr)->next)
 		if (astring_cmpc((*infoptr)->name, name) == 0)
 		{
 			region_info *deleteme = *infoptr;
@@ -818,19 +814,17 @@ void memory_region_free(running_machine *machine, int rgnclass, const char *name
     region
 -------------------------------------------------*/
 
-UINT8 *memory_region(running_machine *machine, int rgnclass, const char *name)
+UINT8 *memory_region(running_machine *machine, const char *name)
 {
 	mame_private *mame = machine->mame_data;
 	region_info *info;
     
-    assert(rgnclass < RGNCLASS_COUNT);
-    
     /* NULL tag always fails */
     if (name == NULL)
     	return NULL;
 
     /* make sure we don't have a region of the same name */
-    for (info = mame->regions[rgnclass]; info != NULL; info = info->next)
+    for (info = mame->regions; info != NULL; info = info->next)
     	if (astring_cmpc(info->name, name) == 0)
     		return info->base;
     
@@ -843,19 +837,17 @@ UINT8 *memory_region(running_machine *machine, int rgnclass, const char *name)
     memory region
 -------------------------------------------------*/
 
-UINT32 memory_region_length(running_machine *machine, int rgnclass, const char *name)
+UINT32 memory_region_length(running_machine *machine, const char *name)
 {
 	mame_private *mame = machine->mame_data;
 	region_info *info;
     
-    assert(rgnclass < RGNCLASS_COUNT);
-
     /* NULL tag always fails */
     if (name == NULL)
     	return 0;
 
     /* make sure we don't have a region of the same name */
-    for (info = mame->regions[rgnclass]; info != NULL; info = info->next)
+    for (info = mame->regions; info != NULL; info = info->next)
     	if (astring_cmpc(info->name, name) == 0)
     		return info->length;
     
@@ -868,19 +860,17 @@ UINT32 memory_region_length(running_machine *machine, int rgnclass, const char *
     memory region
 -------------------------------------------------*/
 
-UINT32 memory_region_flags(running_machine *machine, int rgnclass, const char *name)
+UINT32 memory_region_flags(running_machine *machine, const char *name)
 {
 	mame_private *mame = machine->mame_data;
 	region_info *info;
     
-    assert(rgnclass < RGNCLASS_COUNT);
-
     /* NULL tag always fails */
     if (name == NULL)
     	return 0;
 
     /* make sure we don't have a region of the same name */
-    for (info = mame->regions[rgnclass]; info != NULL; info = info->next)
+    for (info = mame->regions; info != NULL; info = info->next)
     	if (astring_cmpc(info->name, name) == 0)
     		return info->flags;
     
@@ -890,19 +880,16 @@ UINT32 memory_region_flags(running_machine *machine, int rgnclass, const char *n
 
 /*-------------------------------------------------
     memory_region_next - the name of the next 
-    memory region of the same class (or the first 
+    memory region (or the first if name == NULL)
-    if name == NULL)
 -------------------------------------------------*/
 
-const char *memory_region_next(running_machine *machine, int rgnclass, const char *name)
+const char *memory_region_next(running_machine *machine, const char *name)
 {
 	mame_private *mame = machine->mame_data;
 	region_info *info;
     
-    assert(rgnclass < RGNCLASS_COUNT);
-
 	/* if there's nothing in this class, fail immediately */
-    info = mame->regions[rgnclass];
+    info = mame->regions;
 	if (info == NULL)
 		return NULL;
 
@@ -919,28 +906,6 @@ const char *memory_region_next(running_machine *machine, int rgnclass, const cha
 }
 
 
-/*-------------------------------------------------
-    memory_region_class_name - return the name of
-    the given memory region class
--------------------------------------------------*/
-
-const char *memory_region_class_name(int rgnclass, int lowercase)
-{
-	switch (rgnclass)
-	{
-		default:				return lowercase ? "unknown" : "Unknown";
-		case RGNCLASS_CPU:		return lowercase ? "cpu" : "CPU";
-		case RGNCLASS_GFX:		return lowercase ? "gfx" : "Gfx";
-		case RGNCLASS_SOUND:	return lowercase ? "sound" : "Sound";
-		case RGNCLASS_USER:		return lowercase ? "user" : "User";
-		case RGNCLASS_DISKS:	return lowercase ? "disk" : "Disk";
-		case RGNCLASS_PROMS:	return lowercase ? "prom" : "PROM";
-		case RGNCLASS_PLDS:		return lowercase ? "pld" : "PLD";
-	}
-	return NULL;
-}
-
-
 
 /***************************************************************************
     OUTPUT MANAGEMENT
@@ -1529,7 +1494,6 @@ static void init_machine(running_machine *machine)
 	mame_private *mame = machine->mame_data;
 	const char *rgntag, *nextrgntag;
 	time_t newbase;
-	int rgnclass;
 
 	/* initialize basic can't-fail systems here */
 	cpuintrf_init(machine);
@@ -1621,13 +1585,12 @@ static void init_machine(running_machine *machine)
 		(*machine->config->video_start)(machine);
 
 	/* free memory regions allocated with REGIONFLAG_DISPOSE (typically gfx roms) */
-	for (rgnclass = 0; rgnclass < RGNCLASS_COUNT; rgnclass++)
+	for (rgntag = memory_region_next(machine, NULL); rgntag != NULL; rgntag = nextrgntag)
-		for (rgntag = memory_region_next(machine, rgnclass, NULL); rgntag != NULL; rgntag = nextrgntag)
+	{
-		{
+		nextrgntag = memory_region_next(machine, rgntag);
-			nextrgntag = memory_region_next(machine, rgnclass, rgntag);
+		if (memory_region_flags(machine, rgntag) & ROMREGION_DISPOSE)
-			if (memory_region_flags(machine, rgnclass, rgntag) & ROMREGION_DISPOSE)
+			memory_region_free(machine, rgntag);
-				memory_region_free(machine, rgnclass, rgntag);
+	}
-		}
 
 	/* initialize miscellaneous systems */
 	saveload_init(machine);

src/emu/mame.h

@@ -114,21 +114,6 @@ enum _output_channel
 typedef enum _output_channel output_channel;
 
 
-/* memory region classes */
-enum
-{
-	RGNCLASS_INVALID = 0x00,
-	RGNCLASS_CPU,
-	RGNCLASS_GFX,
-	RGNCLASS_SOUND,
-	RGNCLASS_USER,
-	RGNCLASS_DISKS,
-	RGNCLASS_PROMS,
-	RGNCLASS_PLDS,
-	RGNCLASS_COUNT
-};
-
-
 
 /***************************************************************************
     TYPE DEFINITIONS
@@ -298,25 +283,22 @@ int mame_is_paused(running_machine *machine);
 /* ----- memory region management ----- */
 
 /* allocate a new memory region */
-UINT8 *memory_region_alloc(running_machine *machine, int rgnclass, const char *name, UINT32 length, UINT32 flags);
+UINT8 *memory_region_alloc(running_machine *machine, const char *name, UINT32 length, UINT32 flags);
 
 /* free an allocated memory region */
-void memory_region_free(running_machine *machine, int rgnclass, const char *name);
+void memory_region_free(running_machine *machine, const char *name);
 
 /* return a pointer to a specified memory region */
-UINT8 *memory_region(running_machine *machine, int rgnclass, const char *name);
+UINT8 *memory_region(running_machine *machine, const char *name);
 
 /* return the size (in bytes) of a specified memory region */
-UINT32 memory_region_length(running_machine *machine, int rgnclass, const char *name);
+UINT32 memory_region_length(running_machine *machine, const char *name);
 
 /* return the flags (defined in romload.h) for a specified memory region */
-UINT32 memory_region_flags(running_machine *machine, int rgnclass, const char *name);
+UINT32 memory_region_flags(running_machine *machine, const char *name);
 
 /* return the name of the next memory region of the same class (or the first if name == NULL) */
-const char *memory_region_next(running_machine *machine, int rgnclass, const char *name);
+const char *memory_region_next(running_machine *machine, const char *name);
-
-/* return the name of the given memory region class */
-const char *memory_region_class_name(int rgnclass, int lowercase);
 
 
 

src/emu/memory.c

@@ -1031,8 +1031,8 @@ static void address_map_detokenize(address_map *map, const addrmap_token *tokens
 
 			case ADDRMAP_TOKEN_REGION:
 				TOKEN_UNGET_UINT32(tokens);
-				TOKEN_GET_UINT64_UNPACK3(tokens, entrytype, 8, entry->rgnclass, 24, entry->rgnoffs, 32);
+				TOKEN_GET_UINT64_UNPACK2(tokens, entrytype, 8, entry->rgnoffs, 32);
-				entry->rgntag = TOKEN_GET_STRING(tokens);
+				entry->region = TOKEN_GET_STRING(tokens);
 				break;
 
 			case ADDRMAP_TOKEN_SHARE:
@@ -1618,8 +1618,8 @@ static void memory_init_cpudata(running_machine *machine)
 
 		/* get pointers to the CPU's memory region */
 		cpu->tag = config->cpu[cpunum].tag;
-		cpu->region = memory_region(machine, RGNCLASS_CPU, cpu->tag);
+		cpu->region = memory_region(machine, cpu->tag);
-		cpu->regionsize = memory_region_length(machine, RGNCLASS_CPU, cpu->tag);
+		cpu->regionsize = memory_region_length(machine, cpu->tag);
 
 		/* initialize each address space, and build up a mask of spaces */
 		for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
@@ -1727,33 +1727,32 @@ static void memory_init_preflight(running_machine *machine)
 					adjust_addresses(space, &entry->bytestart, &entry->byteend, &entry->bytemask, &entry->bytemirror);
 
 					/* if this is a ROM handler without a specified region, attach it to the implicit region */
-					if (spacenum == ADDRESS_SPACE_PROGRAM && HANDLER_IS_ROM(entry->read.generic) && entry->rgntag == NULL)
+					if (spacenum == ADDRESS_SPACE_PROGRAM && HANDLER_IS_ROM(entry->read.generic) && entry->region == NULL)
 					{
 						/* make sure it fits within the memory region before doing so, however */
 						if (entry->byteend < cpu->regionsize)
 						{
-							entry->rgnclass = RGNCLASS_CPU;
+							entry->region = cpu->tag;
-							entry->rgntag = cpu->tag;
 							entry->rgnoffs = entry->bytestart;
 						}
 					}
 
 					/* validate adjusted addresses against implicit regions */
-					if (entry->rgntag != NULL && entry->share == 0 && entry->baseptr == NULL)
+					if (entry->region != NULL && entry->share == 0 && entry->baseptr == NULL)
 					{
-						UINT8 *base = memory_region(machine, entry->rgnclass, entry->rgntag);
+						UINT8 *base = memory_region(machine, entry->region);
-						offs_t length = memory_region_length(machine, entry->rgnclass, entry->rgntag);
+						offs_t length = memory_region_length(machine, entry->region);
 
 						/* validate the region */
 						if (base == NULL)
-							fatalerror("Error: CPU %d space %d memory map entry %X-%X references non-existant region %d,\"%s\"", cpunum, spacenum, entry->addrstart, entry->addrend, entry->rgnclass, entry->rgntag);
+							fatalerror("Error: CPU %d space %d memory map entry %X-%X references non-existant region \"%s\"", cpunum, spacenum, entry->addrstart, entry->addrend, entry->region);
 						if (entry->rgnoffs + (entry->byteend - entry->bytestart + 1) > length)
-							fatalerror("Error: CPU %d space %d memory map entry %X-%X extends beyond region %d,\"%s\" size (%X)", cpunum, spacenum, entry->addrstart, entry->addrend, entry->rgnclass, entry->rgntag, length);
+							fatalerror("Error: CPU %d space %d memory map entry %X-%X extends beyond region \"%s\" size (%X)", cpunum, spacenum, entry->addrstart, entry->addrend, entry->region, length);
 					}
 
 					/* convert any region-relative entries to their memory pointers */
-					if (entry->rgntag != NULL)
+					if (entry->region != NULL)
-						entry->memory = memory_region(machine, entry->rgnclass, entry->rgntag) + entry->rgnoffs;
+						entry->memory = memory_region(machine, entry->region) + entry->rgnoffs;
 
 					/* assign static banks for explicitly specified entries */
 					if (HANDLER_IS_BANK(entry->read.generic))
@@ -2560,9 +2559,7 @@ static void *allocate_memory_block(running_machine *machine, int cpunum, int spa
 	int allocatemem = (memory == NULL);
 	memory_block *block;
 	size_t bytestoalloc;
-	const char *rgntag;
+	const char *region;
-	int foundit = FALSE;
-	int rgnclass;
 
 	VPRINTF(("allocate_memory_block(%d,%d,%08X,%08X,%p)\n", cpunum, spacenum, bytestart, byteend, memory));
 
@@ -2578,19 +2575,17 @@ static void *allocate_memory_block(running_machine *machine, int cpunum, int spa
 		memory = block + 1;
 
 	/* register for saving, but only if we're not part of a memory region */
-	for (rgnclass = 0; rgnclass < RGNCLASS_COUNT; rgnclass++)
+	for (region = memory_region_next(machine, NULL); region != NULL; region = memory_region_next(machine, region))
-		for (rgntag = memory_region_next(machine, rgnclass, NULL); !foundit && rgntag != NULL; rgntag = memory_region_next(machine, rgnclass, rgntag))
+	{
+		UINT8 *region_base = memory_region(Machine, region);
+		UINT32 region_length = memory_region_length(Machine, region);
+		if (region_base != NULL && region_length != 0 && (UINT8 *)memory >= region_base && ((UINT8 *)memory + (byteend - bytestart + 1)) < region_base + region_length)
 		{
-			UINT8 *region_base = memory_region(Machine, rgnclass, rgntag);
+			VPRINTF(("skipping save of this memory block as it is covered by a memory region\n"));
-			UINT32 region_length = memory_region_length(Machine, rgnclass, rgntag);
+			break;
-			if (region_base != NULL && region_length != 0 && (UINT8 *)memory >= region_base && ((UINT8 *)memory + (byteend - bytestart + 1)) < region_base + region_length)
-			{
-				VPRINTF(("skipping save of this memory block as it is covered by a memory region\n"));
-				foundit = TRUE;
-				break;
-			}
 		}
-	if (rgnclass == RGNCLASS_COUNT)
+	}
+	if (region == NULL)
 		register_for_save(cpunum, spacenum, bytestart, memory, byteend - bytestart + 1);
 
 	/* fill in the tracking block */

src/emu/memory.h

@@ -225,9 +225,8 @@ struct _address_map_entry
 	size_t *				sizeptr;			/* receives size of area in bytes (optional) */
 	UINT32					baseptroffs_plus1;	/* offset of base pointer within driver_data, plus 1 */
 	UINT32					sizeptroffs_plus1;	/* offset of size pointer within driver_data, plus 1 */
-	UINT32					rgnclass;			/* class of region containing the memory backing this entry */
+	const char *			region;				/* tag of region containing the memory backing this entry */
-	const char *			rgntag;				/* tag of region containing the memory backing this entry */
+	offs_t					rgnoffs;			/* offset within the region */
-	offs_t					rgnoffs;		/* offset within the region */
 
 	void *					memory;				/* pointer to memory backing this entry */
 	offs_t					bytestart;			/* byte-adjusted start address */
@@ -765,8 +764,8 @@ union _addrmap64_token
 	TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_READ_PORT, 8, 0, 8, 0, 8), \
 	TOKEN_STRING(_tag),
 
-#define AM_REGION(_class, _tag, _offs) \
+#define AM_REGION(_tag, _offs) \
-	TOKEN_UINT64_PACK3(ADDRMAP_TOKEN_REGION, 8, _class, 24, _offs, 32), \
+	TOKEN_UINT64_PACK2(ADDRMAP_TOKEN_REGION, 8, _offs, 32), \
 	TOKEN_STRING(_tag),
 
 #define AM_SHARE(_index) \

src/emu/romload.c

@@ -422,15 +422,13 @@ static void display_rom_load_results(rom_load_data *romdata)
 	if (romdata->errors != 0)
 	{
 		const char *rgntag, *nextrgntag;
-		int rgnclass;
 		
 		/* clean up any regions */
-		for (rgnclass = 0; rgnclass < RGNCLASS_COUNT; rgnclass++)
+		for (rgntag = memory_region_next(Machine, NULL); rgntag != NULL; rgntag = nextrgntag)
-			for (rgntag = memory_region_next(Machine, rgnclass, NULL); rgntag != NULL; rgntag = nextrgntag)
+		{
-			{
+			nextrgntag = memory_region_next(Machine, rgntag);
-				nextrgntag = memory_region_next(Machine, rgnclass, rgntag);
+			memory_region_free(Machine, rgntag);
-				memory_region_free(Machine, rgnclass, rgntag);
+		}
-			}
 
 		/* create the error message and exit fatally */
 		strcat(romdata->errorbuf, "ERROR: required files are missing, the game cannot be run.");
@@ -451,11 +449,11 @@ static void display_rom_load_results(rom_load_data *romdata)
     byte swapping and inverting data as necessary
 -------------------------------------------------*/
 
-static void region_post_process(running_machine *machine, rom_load_data *romdata, int rgnclass, const char *rgntag)
+static void region_post_process(running_machine *machine, rom_load_data *romdata, const char *rgntag)
 {
-	UINT32 regionlength = memory_region_length(machine, rgnclass, rgntag);
+	UINT32 regionlength = memory_region_length(machine, rgntag);
-	UINT32 regionflags = memory_region_flags(machine, rgnclass, rgntag);
+	UINT32 regionflags = memory_region_flags(machine, rgntag);
-	UINT8 *regionbase = memory_region(machine, rgnclass, rgntag);
+	UINT8 *regionbase = memory_region(machine, rgntag);
 	int littleendian = ((regionflags & ROMREGION_ENDIANMASK) == ROMREGION_LE);
 	int datawidth = 1 << ((regionflags & ROMREGION_WIDTHMASK) >> 8);
 	UINT8 *base;
@@ -688,7 +686,6 @@ static void fill_rom_data(rom_load_data *romdata, const rom_entry *romp)
 static void copy_rom_data(rom_load_data *romdata, const rom_entry *romp)
 {
 	UINT8 *base = romdata->regionbase + ROM_GETOFFSET(romp);
-	int srcrgnclass = (ROM_GETFLAGS(romp) >> 4) & 0x0f;
 	const char *srcrgntag = ROM_GETNAME(romp);
 	UINT32 numbytes = ROM_GETLENGTH(romp);
 	UINT32 srcoffs = (FPTR)ROM_GETHASHDATA(romp);  /* srcoffset in place of hashdata */
@@ -703,12 +700,12 @@ static void copy_rom_data(rom_load_data *romdata, const rom_entry *romp)
 		fatalerror("Error in RomModule definition: COPY has an invalid length\n");
 
 	/* make sure the source was valid */
-	srcbase = memory_region(Machine, srcrgnclass, srcrgntag);
+	srcbase = memory_region(Machine, srcrgntag);
 	if (srcbase == NULL)
 		fatalerror("Error in RomModule definition: COPY from an invalid region\n");
 
 	/* make sure we find within the region space */
-	if (srcoffs + numbytes > memory_region_length(Machine, srcrgnclass, srcrgntag))
+	if (srcoffs + numbytes > memory_region_length(Machine, srcrgntag))
 		fatalerror("Error in RomModule definition: COPY out of source memory region space\n");
 
 	/* fill the data */
@@ -1118,19 +1115,18 @@ void rom_init(running_machine *machine, const rom_entry *romp)
 		UINT32 regionlength = ROMREGION_GETLENGTH(region);
 		UINT32 regionflags = ROMREGION_GETFLAGS(region);
 		const char *regiontag = ROMREGION_GETTAG(region);
-		int regionclass = ROMREGION_GETCLASS(region);
 
-		LOG(("Processing region %d,\"%s\" (length=%X)\n", regionclass, regiontag, regionlength));
+		LOG(("Processing region \"%s\" (length=%X)\n", regiontag, regionlength));
 
 		/* the first entry must be a region */
 		assert(ROMENTRY_ISREGION(region));
 
 		/* if this is a CPU region, override with the CPU width and endianness */
-		if (regionclass == RGNCLASS_CPU)
+		if (mame_find_cpu_index(machine, regiontag) >= 0)
 			regionflags = normalize_flags_for_cpu(machine, regionflags, regiontag);
 
 		/* remember the base and length */
-		romdata.regionbase = memory_region_alloc(machine, regionclass, regiontag, regionlength, regionflags);
+		romdata.regionbase = memory_region_alloc(machine, regiontag, regionlength, regionflags);
 		romdata.regionlength = regionlength;
 		LOG(("Allocated %X bytes @ %p\n", romdata.regionlength, romdata.regionbase));
 
@@ -1155,7 +1151,7 @@ void rom_init(running_machine *machine, const rom_entry *romp)
 			process_disk_entries(&romdata, region + 1);
 
 		/* finally, post-process for endianness and inversion */
-		region_post_process(machine, &romdata, regionclass, regiontag);
+		region_post_process(machine, &romdata, regiontag);
 	}
 
 	/* display the results and exit */
@@ -1173,15 +1169,13 @@ static void rom_exit(running_machine *machine)
 {
 	const char *rgntag, *nextrgntag;
 	open_chd *curchd;
-	int rgnclass;
 
 	/* free the memory allocated for various regions */
-	for (rgnclass = 0; rgnclass < RGNCLASS_COUNT; rgnclass++)
+	for (rgntag = memory_region_next(machine, NULL); rgntag != NULL; rgntag = nextrgntag)
-		for (rgntag = memory_region_next(machine, rgnclass, NULL); rgntag != NULL; rgntag = nextrgntag)
+	{
-		{
+		nextrgntag = memory_region_next(machine, rgntag);
-			nextrgntag = memory_region_next(machine, rgnclass, rgntag);
+		memory_region_free(machine, rgntag);
-			memory_region_free(machine, rgnclass, rgntag);
+	}
-		}
 
 	/* close all hard drives */
 	for (curchd = chd_list; curchd != NULL; curchd = curchd->next)

src/emu/romload.h

@@ -41,8 +41,6 @@ enum
 };
 
 /* ----- per-region constants ----- */
-#define ROMREGION_CLASSMASK			0x000000f0			/* class of region */
-
 #define ROMREGION_WIDTHMASK			0x00000300			/* native width of region, as power of 2 */
 #define		ROMREGION_8BIT			0x00000000			/*    (non-CPU regions only) */
 #define		ROMREGION_16BIT			0x00000100
@@ -176,7 +174,6 @@ struct _rom_load_data
 #define ROMREGION_GETTAG(r)			((r)->_name)
 #define ROMREGION_GETLENGTH(r)		((r)->_length)
 #define ROMREGION_GETFLAGS(r)		((r)->_flags)
-#define ROMREGION_GETCLASS(r)		((ROMREGION_GETFLAGS(r) & ROMREGION_CLASSMASK) >> 4)
 #define ROMREGION_GETWIDTH(r)		(8 << ((ROMREGION_GETFLAGS(r) & ROMREGION_WIDTHMASK) >> 8))
 #define ROMREGION_ISLITTLEENDIAN(r)	((ROMREGION_GETFLAGS(r) & ROMREGION_ENDIANMASK) == ROMREGION_LE)
 #define ROMREGION_ISBIGENDIAN(r)	((ROMREGION_GETFLAGS(r) & ROMREGION_ENDIANMASK) == ROMREGION_BE)
@@ -218,13 +215,13 @@ struct _rom_load_data
 
 
 /* ----- ROM region macros ----- */
-#define ROM_REGION(length,rclass,rtag,flags)		{ rtag, NULL, 0, length, ROMENTRYTYPE_REGION | ((rclass) << 4) | (flags) },
+#define ROM_REGION(length,tag,flags)				{ tag, NULL, 0, length, ROMENTRYTYPE_REGION | (flags) },
-#define ROM_REGION16_LE(length,rclass,rtag,flags)	ROM_REGION(length, rclass, rtag, (flags) | ROMREGION_16BIT | ROMREGION_LE)
+#define ROM_REGION16_LE(length,tag,flags)			ROM_REGION(length, tag, (flags) | ROMREGION_16BIT | ROMREGION_LE)
-#define ROM_REGION16_BE(length,rclass,rtag,flags)	ROM_REGION(length, rclass, rtag, (flags) | ROMREGION_16BIT | ROMREGION_BE)
+#define ROM_REGION16_BE(length,tag,flags)			ROM_REGION(length, tag, (flags) | ROMREGION_16BIT | ROMREGION_BE)
-#define ROM_REGION32_LE(length,rclass,rtag,flags)	ROM_REGION(length, rclass, rtag, (flags) | ROMREGION_32BIT | ROMREGION_LE)
+#define ROM_REGION32_LE(length,tag,flags)			ROM_REGION(length, tag, (flags) | ROMREGION_32BIT | ROMREGION_LE)
-#define ROM_REGION32_BE(length,rclass,rtag,flags)	ROM_REGION(length, rclass, rtag, (flags) | ROMREGION_32BIT | ROMREGION_BE)
+#define ROM_REGION32_BE(length,tag,flags)			ROM_REGION(length, tag, (flags) | ROMREGION_32BIT | ROMREGION_BE)
-#define ROM_REGION64_LE(length,rclass,rtag,flags)	ROM_REGION(length, rclass, rtag, (flags) | ROMREGION_64BIT | ROMREGION_LE)
+#define ROM_REGION64_LE(length,tag,flags)			ROM_REGION(length, tag, (flags) | ROMREGION_64BIT | ROMREGION_LE)
-#define ROM_REGION64_BE(length,rclass,rtag,flags)	ROM_REGION(length, rclass, rtag, (flags) | ROMREGION_64BIT | ROMREGION_BE)
+#define ROM_REGION64_BE(length,tag,flags)			ROM_REGION(length, tag, (flags) | ROMREGION_64BIT | ROMREGION_BE)
 
 
 /* ----- core ROM loading macros ----- */
@@ -250,7 +247,7 @@ struct _rom_load_data
 #define ROM_RELOAD(offset,length)					{ NULL, NULL, offset, length, ROMENTRYTYPE_RELOAD | ROM_INHERITFLAGS },
 #define ROM_IGNORE(length)							{ NULL, NULL, 0,      length, ROMENTRYTYPE_IGNORE | ROM_INHERITFLAGS },
 #define ROM_FILL(offset,length,value)				{ NULL, (const char *)value, offset, length, ROMENTRYTYPE_FILL },
-#define ROM_COPY(rclass,rtag,srcoffs,offset,length) { rtag, (const char *)srcoffs, offset, length, ROMENTRYTYPE_COPY | ((rclass) << 4) },
+#define ROM_COPY(srctag,srcoffs,offset,length) 		{ srctag, (const char *)srcoffs, offset, length, ROMENTRYTYPE_COPY },
 
 
 /* ----- system BIOS macros ----- */
@@ -258,7 +255,7 @@ struct _rom_load_data
 
 
 /* ----- disk loading macros ----- */
-#define DISK_REGION(type, tag)						ROM_REGION(1, type, tag, ROMREGION_DATATYPEDISK)
+#define DISK_REGION(tag)							ROM_REGION(1, tag, ROMREGION_DATATYPEDISK)
 #define DISK_IMAGE(name,idx,hash)					ROMX_LOAD(name, idx, 0, hash, DISK_READWRITE)
 #define DISK_IMAGE_READONLY(name,idx,hash)			ROMX_LOAD(name, idx, 0, hash, DISK_READONLY)
 

src/emu/sound/2608intf.c

@@ -151,8 +151,8 @@ static void *ym2608_start(const char *tag, int sndindex, int clock, const void *
 	/* stream system initialize */
 	info->stream = stream_create(0,2,rate,info,ym2608_stream_update);
 	/* setup adpcm buffers */
-	pcmbufa  = (void *)(memory_region(Machine, RGNCLASS_SOUND, tag));
+	pcmbufa  = (void *)(memory_region(Machine, tag));
-	pcmsizea = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	pcmsizea = memory_region_length(Machine, tag);
 
 	/* initialize YM2608 */
 	info->chip = YM2608Init(info,sndindex,clock,rate,

src/emu/sound/2610intf.c

@@ -152,11 +152,11 @@ static void *ym2610_start(const char *tag, int sndindex, int clock, const void *
 	/* stream system initialize */
 	info->stream = stream_create(0,2,rate,info,ym2610_stream_update);
 	/* setup adpcm buffers */
-	pcmbufa  = (void *)(memory_region(Machine, RGNCLASS_SOUND, tag));
+	pcmbufa  = (void *)(memory_region(Machine, tag));
-	pcmsizea = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	pcmsizea = memory_region_length(Machine, tag);
 	astring_printf(name, "%s.deltat", tag);
-	pcmbufb  = (void *)(memory_region(Machine, RGNCLASS_SOUND, astring_c(name)));
+	pcmbufb  = (void *)(memory_region(Machine, astring_c(name)));
-	pcmsizeb = memory_region_length(Machine, RGNCLASS_SOUND, astring_c(name));
+	pcmsizeb = memory_region_length(Machine, astring_c(name));
 	astring_free(name);
 	if (pcmbufb == NULL || pcmsizeb == 0)
 	{
@@ -218,11 +218,11 @@ static void *ym2610b_start(const char *tag, int sndindex, int clock, const void
 	/* stream system initialize */
 	info->stream = stream_create(0,2,rate,info,ym2610b_stream_update);
 	/* setup adpcm buffers */
-	pcmbufa  = (void *)(memory_region(Machine, RGNCLASS_SOUND, tag));
+	pcmbufa  = (void *)(memory_region(Machine, tag));
-	pcmsizea = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	pcmsizea = memory_region_length(Machine, tag);
 	astring_printf(name, "%s.deltat", tag);
-	pcmbufb  = (void *)(memory_region(Machine, RGNCLASS_SOUND, astring_c(name)));
+	pcmbufb  = (void *)(memory_region(Machine, astring_c(name)));
-	pcmsizeb = memory_region_length(Machine, RGNCLASS_SOUND, astring_c(name));
+	pcmsizeb = memory_region_length(Machine, astring_c(name));
 	astring_free(name);
 	if (pcmbufb == NULL || pcmsizeb == 0)
 	{

src/emu/sound/3812intf.c

@@ -462,8 +462,8 @@ static void *y8950_start(const char *tag, int sndindex, int clock, const void *c
 
 	/* ADPCM ROM data */
 	Y8950SetDeltaTMemory(info->chip,
-		(void *)(memory_region(Machine, RGNCLASS_SOUND, tag)),
+		(void *)(memory_region(Machine, tag)),
-			memory_region_length(Machine, RGNCLASS_SOUND, tag) );
+			memory_region_length(Machine, tag) );
 
 	info->stream = stream_create(0,1,rate,info,y8950_stream_update);
 

src/emu/sound/5110intf.c

@@ -39,7 +39,7 @@ static void tms5110_update(void *param, stream_sample_t **inputs, stream_sample_
 static int speech_rom_read_bit(void)
 {
 	struct tms5110_info *info = sndti_token(SOUND_TMS5110, 0);
-	const UINT8 *table = memory_region(Machine, RGNCLASS_SOUND, info->tag);
+	const UINT8 *table = memory_region(Machine, info->tag);
 
 	int r;
 
@@ -84,7 +84,7 @@ static void *tms5110_start(const char *tag, int sndindex, int clock, const void
 	/* initialize a stream */
 	info->stream = stream_create(0, 1, clock / 80, info, tms5110_update);
 
-	if (memory_region(Machine, RGNCLASS_SOUND, tag) == NULL)
+	if (memory_region(Machine, tag) == NULL)
 	{
 	    if (info->intf->M0_callback==NULL)
 	    {

src/emu/sound/aica.c

@@ -534,11 +534,11 @@ static void AICA_Init(const char *tag, struct _AICA *AICA, const struct AICAinte
 			AICA->Master=0;
 		}
 
-		AICA->AICARAM = memory_region(Machine, RGNCLASS_SOUND, tag);
+		AICA->AICARAM = memory_region(Machine, tag);
 		if (AICA->AICARAM)
 		{
 			AICA->AICARAM += intf->roffset;
-			AICA->AICARAM_LENGTH = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+			AICA->AICARAM_LENGTH = memory_region_length(Machine, tag);
 			AICA->RAM_MASK = AICA->AICARAM_LENGTH-1;
 			AICA->RAM_MASK16 = AICA->RAM_MASK & 0x7ffffe;
 			AICA->DSP.AICARAM = (UINT16 *)AICA->AICARAM;

src/emu/sound/bsmt2000.c

@@ -121,8 +121,8 @@ static void *bsmt2000_start(const char *tag, int sndindex, int clock, const void
 	chip->clock = clock;
 
 	/* initialize the regions */
-	chip->region_base = (INT8 *)memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->region_base = (INT8 *)memory_region(Machine, tag);
-	chip->total_banks = memory_region_length(Machine, RGNCLASS_SOUND, tag) / 0x10000;
+	chip->total_banks = memory_region_length(Machine, tag) / 0x10000;
 
 	/* register chip-wide data for save states */
 	state_save_register_item("bsmt2000", sndindex * 16, chip->last_register);

src/emu/sound/c140.c

@@ -469,7 +469,7 @@ static void *c140_start(const char *tag, int sndindex, int clock, const void *co
 
 	info->stream = stream_create(0,2,info->sample_rate,info,update_stereo);
 
-	info->pRom=memory_region(Machine, RGNCLASS_SOUND, tag);
+	info->pRom=memory_region(Machine, tag);
 
 	/* make decompress pcm table */		//2000.06.26 CAB
 	{

src/emu/sound/c352.c

@@ -551,8 +551,8 @@ static void *c352_start(const char *tag, int sndindex, int clock, const void *co
 	info = auto_malloc(sizeof(*info));
 	memset(info, 0, sizeof(*info));
 
-	info->c352_rom_samples = memory_region(Machine, RGNCLASS_SOUND, tag);
+	info->c352_rom_samples = memory_region(Machine, tag);
-	info->c352_rom_length = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	info->c352_rom_length = memory_region_length(Machine, tag);
 
 	info->sample_rate_base = clock / 192;
 

src/emu/sound/es5506.c

@@ -842,10 +842,10 @@ static void *es5506_start_common(sound_type sndtype, const char *tag, int sndind
 	chip->stream = stream_create(0, 2, clock / (16*32), chip, es5506_update);
 
 	/* initialize the regions */
-	chip->region_base[0] = intf->region0 ? (UINT16 *)memory_region(Machine, RGNCLASS_SOUND, intf->region0) : NULL;
+	chip->region_base[0] = intf->region0 ? (UINT16 *)memory_region(Machine, intf->region0) : NULL;
-	chip->region_base[1] = intf->region1 ? (UINT16 *)memory_region(Machine, RGNCLASS_SOUND, intf->region1) : NULL;
+	chip->region_base[1] = intf->region1 ? (UINT16 *)memory_region(Machine, intf->region1) : NULL;
-	chip->region_base[2] = intf->region2 ? (UINT16 *)memory_region(Machine, RGNCLASS_SOUND, intf->region2) : NULL;
+	chip->region_base[2] = intf->region2 ? (UINT16 *)memory_region(Machine, intf->region2) : NULL;
-	chip->region_base[3] = intf->region3 ? (UINT16 *)memory_region(Machine, RGNCLASS_SOUND, intf->region3) : NULL;
+	chip->region_base[3] = intf->region3 ? (UINT16 *)memory_region(Machine, intf->region3) : NULL;
 
 	/* initialize the rest of the structure */
 	chip->master_clock = clock;

src/emu/sound/es8712.c

@@ -226,7 +226,7 @@ static void *es8712_start(const char *tag, int sndindex, int clock, const void *
 	chip->repeat = 0;
 
 	chip->bank_offset = 0;
-	chip->region_base = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->region_base = memory_region(Machine, tag);
 
 	/* generate the name and create the stream */
 	chip->stream = stream_create(0, 1, clock, chip, es8712_update);

src/emu/sound/gaelco.c

@@ -259,9 +259,9 @@ static void *gaelcosnd_start(sound_type sndtype, const char *tag, int sndindex,
 		info->banks[j] = intf->banks[j];
 	}
 	info->stream = stream_create(0, 2, 8000, info, gaelco_update);
-	info->snd_data = (UINT8 *)memory_region(Machine, RGNCLASS_GFX, intf->gfxregion);
+	info->snd_data = (UINT8 *)memory_region(Machine, intf->gfxregion);
 	if (info->snd_data == NULL)
-		info->snd_data = (UINT8 *)memory_region(Machine, RGNCLASS_SOUND, tag);
+		info->snd_data = (UINT8 *)memory_region(Machine, tag);
 
 	/* init volume table */
 	for (vol = 0; vol < VOLUME_LEVELS; vol++){

src/emu/sound/ics2115.c

@@ -458,7 +458,7 @@ static void *ics2115_start(const char *tag, int sndindex, int clock, const void
 
 	chip->intf = config;
 	chip->index = sndindex;
-	chip->rom = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->rom = memory_region(Machine, tag);
 	chip->timer[0].timer = timer_alloc(timer_cb_0, chip);
 	chip->timer[1].timer = timer_alloc(timer_cb_1, chip);
 	chip->ulaw = auto_malloc(256*sizeof(INT16));

src/emu/sound/iremga20.c

@@ -235,8 +235,8 @@ static void *iremga20_start(const char *tag, int sndindex, int clock, const void
 	memset(chip, 0, sizeof(*chip));
 
 	/* Initialize our chip structure */
-	chip->rom = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->rom = memory_region(Machine, tag);
-	chip->rom_size = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	chip->rom_size = memory_region_length(Machine, tag);
 
 	iremga20_reset(chip);
 

src/emu/sound/k005289.c

@@ -172,7 +172,7 @@ static void *k005289_start(const char *tag, int sndindex, int clock, const void
 	if (make_mixer_table(info, 2))
 		return NULL;
 
-	info->sound_prom = memory_region(Machine, RGNCLASS_SOUND, tag);
+	info->sound_prom = memory_region(Machine, tag);
 
 	/* reset all the voices */
 	voice[0].frequency = 0;

src/emu/sound/k007232.c

@@ -307,9 +307,9 @@ static void *k007232_start(const char *tag, int sndindex, int clock, const void
 
 	/* Set up the chips */
 
-	info->pcmbuf[0] = (unsigned char *)memory_region(Machine, RGNCLASS_SOUND, tag);
+	info->pcmbuf[0] = (unsigned char *)memory_region(Machine, tag);
-	info->pcmbuf[1] = (unsigned char *)memory_region(Machine, RGNCLASS_SOUND, tag);
+	info->pcmbuf[1] = (unsigned char *)memory_region(Machine, tag);
-	info->pcmlimit  = (unsigned int)memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	info->pcmlimit  = (unsigned int)memory_region_length(Machine, tag);
 
 	info->clock = clock;
 

src/emu/sound/k053260.c

@@ -208,8 +208,8 @@ static void *k053260_start(const char *tag, int sndindex, int clock, const void
 	ic->intf = (config != NULL) ? config : &defintrf;
 
 	ic->mode = 0;
-	ic->rom = memory_region(Machine, RGNCLASS_SOUND, (ic->intf->rgnoverride != NULL) ? ic->intf->rgnoverride : tag);
+	ic->rom = memory_region(Machine, (ic->intf->rgnoverride != NULL) ? ic->intf->rgnoverride : tag);
-	ic->rom_size = memory_region_length(Machine, RGNCLASS_SOUND, (ic->intf->rgnoverride != NULL) ? ic->intf->rgnoverride : tag) - 1;
+	ic->rom_size = memory_region_length(Machine, (ic->intf->rgnoverride != NULL) ? ic->intf->rgnoverride : tag) - 1;
 
 	K053260_reset( ic );
 

src/emu/sound/k054539.c

@@ -447,8 +447,8 @@ static void K054539_init_chip(const char *tag, struct k054539_info *info, int cl
 	info->cur_ptr = 0;
 	memset(info->ram, 0, 0x4000*2+clock/50*2);
 
-	info->rom = memory_region(Machine, RGNCLASS_SOUND, (info->intf->rgnoverride != NULL) ? info->intf->rgnoverride : tag);
+	info->rom = memory_region(Machine, (info->intf->rgnoverride != NULL) ? info->intf->rgnoverride : tag);
-	info->rom_size = memory_region_length(Machine, RGNCLASS_SOUND, (info->intf->rgnoverride != NULL) ? info->intf->rgnoverride : tag);
+	info->rom_size = memory_region_length(Machine, (info->intf->rgnoverride != NULL) ? info->intf->rgnoverride : tag);
 	info->rom_mask = 0xffffffffU;
 	for(i=0; i<32; i++)
 		if((1U<<i) >= info->rom_size) {

src/emu/sound/multipcm.c

@@ -495,7 +495,7 @@ static void *multipcm_start(const char *tag, int sndindex, int clock, const void
 
 	ptChip=(struct _MultiPCM *)auto_malloc(sizeof(struct _MultiPCM));
 
-	ptChip->ROM=(INT8 *)memory_region(Machine, RGNCLASS_SOUND, tag);
+	ptChip->ROM=(INT8 *)memory_region(Machine, tag);
 	ptChip->Rate=(float) clock / MULTIPCM_CLOCKDIV;
 
 	ptChip->stream = stream_create(0, 2, ptChip->Rate, ptChip, MultiPCM_update);

src/emu/sound/n63701x.c

@@ -107,7 +107,7 @@ static void *namco_63701x_start(const char *tag, int sndindex, int clock, const
 	chip = auto_malloc(sizeof(*chip));
 	memset(chip, 0, sizeof(*chip));
 
-	chip->rom = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->rom = memory_region(Machine, tag);
 
 	chip->stream = stream_create(0, 2, clock/1000, chip, namco_63701x_update);
 

src/emu/sound/namco.c

@@ -108,7 +108,7 @@ static void update_namco_waveform(struct namco_sound *chip, int offset, UINT8 da
 /* build the decoded waveform table */
 static int build_decoded_waveform(struct namco_sound *chip, const char *region)
 {
-	UINT8 *rgnbase = memory_region(Machine, RGNCLASS_SOUND, region);
+	UINT8 *rgnbase = memory_region(Machine, region);
 	INT16 *p;
 	int size;
 	int offset;

src/emu/sound/namco52.c

@@ -139,8 +139,8 @@ static void *namco_52xx_start(const char *tag, int sndindex, int clock, const vo
 	memset(chip, 0, sizeof(*chip));
 
 	chip->intf = config;
-	chip->rom     = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->rom     = memory_region(Machine, tag);
-	chip->rom_len = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	chip->rom_len = memory_region_length(Machine, tag);
 
 	if (chip->intf->play_rate == 0)
 	{

src/emu/sound/nes_apu.c

@@ -691,7 +691,7 @@ static void *nesapu_start(const char *tag, int sndindex, int clock, const void *
 	info->buffer_size+=info->samps_per_sync;
 
 	/* Initialize individual chips */
-	(info->APU.dpcm).cpu_mem=memory_region(Machine, RGNCLASS_CPU, intf->region);
+	(info->APU.dpcm).cpu_mem=memory_region(Machine, intf->region);
 
 	info->stream = stream_create(0, 1, rate, info, NESPSG_update_sound);
 

src/emu/sound/nile.c

@@ -224,7 +224,7 @@ static void *nile_start(const char *tag, int sndindex, int clock, const void *co
 	info = auto_malloc(sizeof(*info));
 	memset(info, 0, sizeof(*info));
 
-	info->sound_ram = (UINT8 *)memory_region(Machine, RGNCLASS_SOUND, tag);
+	info->sound_ram = (UINT8 *)memory_region(Machine, tag);
 
 	info->stream = stream_create(0, 2, 44100, info, nile_update);
 

src/emu/sound/okim6295.c

@@ -330,7 +330,7 @@ static void *okim6295_start(const char *tag, int sndindex, int clock, const void
 
 	info->command = -1;
 	info->bank_offset = 0;
-	info->region_base = memory_region(Machine, RGNCLASS_SOUND, (intf->rgnoverride != NULL) ? intf->rgnoverride : tag);
+	info->region_base = memory_region(Machine, (intf->rgnoverride != NULL) ? intf->rgnoverride : tag);
 
 	info->master_clock = clock;
 

src/emu/sound/qsound.c

@@ -101,8 +101,8 @@ static void *qsound_start(const char *tag, int sndindex, int clock, const void *
 	chip = auto_malloc(sizeof(*chip));
 	memset(chip, 0, sizeof(chip));
 
-	chip->sample_rom = (QSOUND_SRC_SAMPLE *)memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->sample_rom = (QSOUND_SRC_SAMPLE *)memory_region(Machine, tag);
-	chip->sample_rom_length = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	chip->sample_rom_length = memory_region_length(Machine, tag);
 
 	memset(chip->channel, 0, sizeof(chip->channel));
 

src/emu/sound/rf5c400.c

@@ -231,8 +231,8 @@ static void rf5c400_init_chip(const char *tag, struct rf5c400_info *info, int sn
 {
 	int i;
 
-	info->rom = (INT16*)memory_region(Machine, RGNCLASS_SOUND, tag);
+	info->rom = (INT16*)memory_region(Machine, tag);
-	info->rom_length = memory_region_length(Machine, RGNCLASS_SOUND, tag) / 2;
+	info->rom_length = memory_region_length(Machine, tag) / 2;
 
 	// init volume table
 	{

src/emu/sound/s14001a.c

@@ -479,7 +479,7 @@ static void *s14001a_start(const char *tag, int sndindex, int clock, const void
 		chip->filtervals[i] = SILENCE;
 	}
 
-	chip->SpeechRom = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->SpeechRom = memory_region(Machine, tag);
 
 	chip->stream = stream_create(0, 1, clock ? clock : Machine->sample_rate, chip, s14001a_pcm_update);
 

src/emu/sound/scsp.c

@@ -528,10 +528,10 @@ static void SCSP_Init(const char *tag, struct _SCSP *SCSP, const struct SCSPinte
 			SCSP->Master=0;
 		}
 
-		SCSP->SCSPRAM = memory_region(Machine, RGNCLASS_SOUND, tag);
+		SCSP->SCSPRAM = memory_region(Machine, tag);
 		if (SCSP->SCSPRAM)
 		{
-			SCSP->SCSPRAM_LENGTH = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+			SCSP->SCSPRAM_LENGTH = memory_region_length(Machine, tag);
 			SCSP->DSP.SCSPRAM = (UINT16 *)SCSP->SCSPRAM;
 			SCSP->DSP.SCSPRAM_LENGTH = SCSP->SCSPRAM_LENGTH/2;
 			SCSP->SCSPRAM += intf->roffset;

src/emu/sound/segapcm.c

@@ -86,7 +86,7 @@ static void *segapcm_start(const char *tag, int sndindex, int clock, const void
 	spcm = auto_malloc(sizeof(*spcm));
 	memset(spcm, 0, sizeof(*spcm));
 
-	spcm->rom = (const UINT8 *)memory_region(Machine, RGNCLASS_SOUND, tag);
+	spcm->rom = (const UINT8 *)memory_region(Machine, tag);
 	spcm->ram = auto_malloc(0x800);
 
 	memset(spcm->ram, 0xff, 0x800);
@@ -96,7 +96,7 @@ static void *segapcm_start(const char *tag, int sndindex, int clock, const void
 	if(!mask)
 		mask = BANK_MASK7>>16;
 
-	len = memory_region_length(Machine, RGNCLASS_SOUND, tag);
+	len = memory_region_length(Machine, tag);
 	for(rom_mask = 1; rom_mask < len; rom_mask *= 2);
 	rom_mask--;
 

src/emu/sound/sp0256.c

@@ -1206,7 +1206,7 @@ static void *sp0256_start(const char *tag, int sndindex, int clock, const void *
     /* -------------------------------------------------------------------- */
     /*  Setup the ROM.                                                      */
     /* -------------------------------------------------------------------- */
-	sp->rom = memory_region(Machine, RGNCLASS_SOUND, tag);
+	sp->rom = memory_region(Machine, tag);
 	sp0256_bitrevbuff(sp->rom, 0, 0xffff);
 
 	return sp;

src/emu/sound/upd7759.c

@@ -642,7 +642,7 @@ static void *upd7759_start(const char *tag, int sndindex, int clock, const void
 	chip->state = STATE_IDLE;
 
 	/* compute the ROM base or allocate a timer */
-	chip->rom = chip->rombase = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->rom = chip->rombase = memory_region(Machine, tag);
 	if (chip->rom == NULL)
 		chip->timer = timer_alloc(upd7759_slave_update, chip);
 

src/emu/sound/vlm5030.c

@@ -650,10 +650,10 @@ static void *vlm5030_start(const char *tag, int sndindex, int clock, const void
 	VLM5030_reset(chip);
 	chip->phase = PH_IDLE;
 
-	chip->rom = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->rom = memory_region(Machine, tag);
 	/* memory size */
 	if( chip->intf->memory_size == 0)
-		chip->address_mask = memory_region_length(Machine, RGNCLASS_SOUND, tag)-1;
+		chip->address_mask = memory_region_length(Machine, tag)-1;
 	else
 		chip->address_mask = chip->intf->memory_size-1;
 

src/emu/sound/x1_010.c

@@ -111,7 +111,7 @@ static void seta_update( void *param, stream_sample_t **inputs, stream_sample_t
 	register INT8	*start, *end, data;
 	register UINT8	*env;
 	register UINT32	smp_offs, smp_step, env_offs, env_step, delta;
-	UINT8 *snd1 = memory_region(Machine, RGNCLASS_SOUND, info->region);
+	UINT8 *snd1 = memory_region(Machine, info->region);
 
 	// mixer buffer zero clear
 	memset( buffer[0], 0, length*sizeof(*buffer[0]) );

src/emu/sound/ymf271.c

@@ -1756,7 +1756,7 @@ static void *ymf271_start(const char *tag, int sndindex, int clock, const void *
 
 	intf = (config != NULL) ? config : &defintrf;
 
-	ymf271_init(chip, memory_region(Machine, RGNCLASS_SOUND, tag), intf->irq_callback, intf->ext_read, intf->ext_write);
+	ymf271_init(chip, memory_region(Machine, tag), intf->irq_callback, intf->ext_read, intf->ext_write);
 	chip->stream = stream_create(0, 2, clock/384, chip, ymf271_update);
 
 	for (i = 0; i < 256; i++)

src/emu/sound/ymf278b.c

@@ -680,7 +680,7 @@ static void *ymf278b_start(const char *tag, int sndindex, int clock, const void
 
 	intf = (config != NULL) ? config : &defintrf;
 
-	ymf278b_init(chip, memory_region(Machine, RGNCLASS_SOUND, tag), intf->irq_callback, clock);
+	ymf278b_init(chip, memory_region(Machine, tag), intf->irq_callback, clock);
 	chip->stream = stream_create(0, 2, clock/768, chip, ymf278b_pcm_update);
 
 	// Volume table, 1 = -0.375dB, 8 = -3dB, 256 = -96dB

src/emu/sound/ymz280b.c

@@ -644,7 +644,7 @@ static void *ymz280b_start(const char *tag, int sndindex, int clock, const void
 
 	/* initialize the rest of the structure */
 	chip->master_clock = (double)clock / 384.0;
-	chip->region_base = memory_region(Machine, RGNCLASS_SOUND, tag);
+	chip->region_base = memory_region(Machine, tag);
 	chip->irq_callback = intf->irq_callback;
 
 	/* create the stream */

src/emu/validity.c

@@ -63,7 +63,7 @@ struct _region_entry
 typedef struct _region_info region_info;
 struct _region_info
 {
-	region_entry entries[RGNCLASS_COUNT][32];
+	region_entry entries[256];
 };
 
 
@@ -522,8 +522,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
 		/* if this is a region, make sure it's valid, and record the length */
 		if (ROMENTRY_ISREGION(romp))
 		{
-			const char *rgntag = ROMREGION_GETTAG(romp);
+			const char *region = ROMREGION_GETTAG(romp);
-			int rgnclass = ROMREGION_GETCLASS(romp);
 
 			/* if we haven't seen any items since the last region, print a warning */
 			if (items_since_region == 0)
@@ -531,17 +530,10 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
 			items_since_region = (ROMREGION_ISERASE(romp) || ROMREGION_ISDISPOSE(romp)) ? 1 : 0;
 			currgn = NULL;
 
-			/* check for an invalid region */
-			if (rgnclass >= RGNCLASS_COUNT || rgnclass <= RGNCLASS_INVALID)
-			{
-				mame_printf_error("%s: %s has invalid ROM_REGION class %d\n", driver->source_file, driver->name, rgnclass);
-				error = TRUE;
-			}
-
 			/* check for an invalid tag */
-			else if (rgntag == NULL || rgntag[0] == 0)
+			if (region == NULL || region[0] == 0)
 			{
-				mame_printf_error("%s: %s has duplicate ROM_REGION tag \"%s\"\n", driver->source_file, driver->name, rgntag);
+				mame_printf_error("%s: %s has duplicate ROM_REGION tag \"%s\"\n", driver->source_file, driver->name, region);
 				error = TRUE;
 			}
 
@@ -551,21 +543,21 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
 				int rgnnum;
 				
 				/* iterate over all regions found so far */
-				for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries[rgnclass]); rgnnum++)
+				for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries); rgnnum++)
 				{
 					/* stop when we hit an empty */
-					if (rgninfo->entries[rgnclass][rgnnum].tag == NULL)
+					if (rgninfo->entries[rgnnum].tag == NULL)
 					{
-						currgn = &rgninfo->entries[rgnclass][rgnnum];
+						currgn = &rgninfo->entries[rgnnum];
-						currgn->tag = rgntag;
+						currgn->tag = region;
 						currgn->length = ROMREGION_GETLENGTH(romp);
 						break;
 					}
 					
 					/* fail if we hit a duplicate */
-					if (strcmp(rgninfo->entries[rgnclass][rgnnum].tag, rgntag) == 0)
+					if (strcmp(rgninfo->entries[rgnnum].tag, region) == 0)
 					{
-						mame_printf_error("%s: %s has duplicate ROM_REGION type %d,\"%s\"\n", driver->source_file, driver->name, rgnclass, rgntag);
+						mame_printf_error("%s: %s has duplicate ROM_REGION type \"%s\"\n", driver->source_file, driver->name, region);
 						error = TRUE;
 						break;
 					}
@@ -775,36 +767,35 @@ static int validate_cpu(int drivnum, const machine_config *config, region_info *
 				}
 
 				/* if this is a program space, auto-assign implicit ROM entries */
-				if ((FPTR)entry->read.generic == STATIC_ROM && entry->rgntag == NULL)
+				if ((FPTR)entry->read.generic == STATIC_ROM && entry->region == NULL)
 				{
-					entry->rgnclass = RGNCLASS_CPU;
+					entry->region = config->cpu[cpunum].tag;
-					entry->rgntag = config->cpu[cpunum].tag;
 					entry->rgnoffs = entry->addrstart;
 				}
 
 				/* if this entry references a memory region, validate it */
-				if (entry->rgntag != NULL && entry->share == 0)
+				if (entry->region != NULL && entry->share == 0)
 				{
 					int rgnnum;
 					
 					/* loop over entries in the class */
-					for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries[entry->rgnclass]); rgnnum++)
+					for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries); rgnnum++)
 					{
 						/* stop if we hit an empty */
-						if (rgninfo->entries[entry->rgnclass][rgnnum].tag == NULL)
+						if (rgninfo->entries[rgnnum].tag == NULL)
 						{
-							mame_printf_error("%s: %s CPU %d space %d memory map entry %X-%X references non-existant region %d,\"%s\"\n", driver->source_file, driver->name, cpunum, spacenum, entry->addrstart, entry->addrend, entry->rgnclass, entry->rgntag);
+							mame_printf_error("%s: %s CPU %d space %d memory map entry %X-%X references non-existant region \"%s\"\n", driver->source_file, driver->name, cpunum, spacenum, entry->addrstart, entry->addrend, entry->region);
 							error = TRUE;
 							break;
 						}
 						
 						/* if we hit a match, check against the length */
-						if (strcmp(rgninfo->entries[entry->rgnclass][rgnnum].tag, entry->rgntag) == 0)
+						if (strcmp(rgninfo->entries[rgnnum].tag, entry->region) == 0)
 						{
-							offs_t length = rgninfo->entries[entry->rgnclass][rgnnum].length;
+							offs_t length = rgninfo->entries[rgnnum].length;
 							if (entry->rgnoffs + (byteend - bytestart + 1) > length)
 							{
-								mame_printf_error("%s: %s CPU %d space %d memory map entry %X-%X extends beyond region %d,\"%s\" size (%X)\n", driver->source_file, driver->name, cpunum, spacenum, entry->addrstart, entry->addrend, entry->rgnclass, entry->rgntag, length);
+								mame_printf_error("%s: %s CPU %d space %d memory map entry %X-%X extends beyond region \"%s\" size (%X)\n", driver->source_file, driver->name, cpunum, spacenum, entry->addrstart, entry->addrend, entry->region, length);
 								error = TRUE;
 							}
 							break;
@@ -980,10 +971,10 @@ static int validate_gfx(int drivnum, const machine_config *config, region_info *
 			int rgnnum;
 
 			/* loop over gfx regions */
-			for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries[RGNCLASS_GFX]); rgnnum++)
+			for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries); rgnnum++)
 			{
 				/* stop if we hit an empty */
-				if (rgninfo->entries[RGNCLASS_GFX][rgnnum].tag == NULL)
+				if (rgninfo->entries[rgnnum].tag == NULL)
 				{
 					mame_printf_error("%s: %s has gfx[%d] referencing non-existent region \"%s\"\n", driver->source_file, driver->name, gfxnum, region);
 					error = TRUE;
@@ -991,7 +982,7 @@ static int validate_gfx(int drivnum, const machine_config *config, region_info *
 				}
 				
 				/* if we hit a match, check against the length */
-				if (strcmp(rgninfo->entries[RGNCLASS_GFX][rgnnum].tag, region) == 0)
+				if (strcmp(rgninfo->entries[rgnnum].tag, region) == 0)
 				{
 					/* if we have a valid region, and we're not using auto-sizing, check the decode against the region length */
 					if (!IS_FRAC(total))
@@ -1011,7 +1002,7 @@ static int validate_gfx(int drivnum, const machine_config *config, region_info *
 						len = total * charincrement;
 
 						/* do we have enough space in the region to cover the whole decode? */
-						avail = rgninfo->entries[RGNCLASS_GFX][rgnnum].length - (gfx->start & ~(charincrement/8-1));
+						avail = rgninfo->entries[rgnnum].length - (gfx->start & ~(charincrement/8-1));
 
 						/* if not, this is an error */
 						if ((start + len) / 8 > avail)

src/emu/video.c

@@ -339,7 +339,7 @@ void video_init(running_machine *machine)
 
 	/* call the PALETTE_INIT function */
 	if (machine->config->init_palette != NULL)
-		(*machine->config->init_palette)(machine, memory_region(machine, RGNCLASS_PROMS, "proms"));
+		(*machine->config->init_palette)(machine, memory_region(machine, "proms"));
 
 	/* actually decode the graphics */
 	if (machine->config->gfxdecodeinfo != NULL)
@@ -478,7 +478,7 @@ static void allocate_graphics(running_machine *machine, const gfx_decode_entry *
 	/* loop over all elements */
 	for (i = 0; i < MAX_GFX_ELEMENTS && gfxdecodeinfo[i].gfxlayout != NULL; i++)
 	{
-		int region_length = 8 * memory_region_length(machine, RGNCLASS_GFX, gfxdecodeinfo[i].memory_region);
+		int region_length = 8 * memory_region_length(machine, gfxdecodeinfo[i].memory_region);
 		int xscale = (gfxdecodeinfo[i].xscale == 0) ? 1 : gfxdecodeinfo[i].xscale;
 		int yscale = (gfxdecodeinfo[i].yscale == 0) ? 1 : gfxdecodeinfo[i].yscale;
 		UINT32 *extpoffs, extxoffs[MAX_ABS_GFX_SIZE], extyoffs[MAX_ABS_GFX_SIZE];
@@ -612,7 +612,7 @@ static void decode_graphics(running_machine *machine, const gfx_decode_entry *gf
 			/* if we have a valid region, decode it now */
 			if (gfxdecodeinfo[i].memory_region != NULL)
 			{
-				UINT8 *region_base = memory_region(machine, RGNCLASS_GFX, gfxdecodeinfo[i].memory_region);
+				UINT8 *region_base = memory_region(machine, gfxdecodeinfo[i].memory_region);
 				gfx_element *gfx = machine->gfx[i];
 				int j;
 

src/mame/audio/atarijsa.c

@@ -116,7 +116,7 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
 	test_mask = testmask;
 
 	/* predetermine the bank base */
-	rgn = memory_region(machine, RGNCLASS_CPU, "jsa");
+	rgn = memory_region(machine, "jsa");
 	bank_base = &rgn[0x03000];
 	bank_source_data = &rgn[0x10000];
 
@@ -159,8 +159,8 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
 		/* the upper 128k is fixed, the lower 128k is bankswitched */
 		for (rgn = 0; rgn < ARRAY_LENGTH(regions); rgn++)
 		{
-			UINT8 *base = memory_region(machine, RGNCLASS_SOUND, regions[rgn]);
+			UINT8 *base = memory_region(machine, regions[rgn]);
-			if (base != NULL && memory_region_length(machine, RGNCLASS_SOUND, regions[rgn]) >= 0x100000)
+			if (base != NULL && memory_region_length(machine, regions[rgn]) >= 0x100000)
 			{
 				memcpy(&base[0x00000], &base[0x80000], 0x20000);
 				memcpy(&base[0x40000], &base[0x80000], 0x20000);

src/mame/audio/cage.c

@@ -158,8 +158,8 @@ void cage_init(running_machine *machine, offs_t speedup)
 
 	cage_irqhandler = NULL;
 
-	memory_set_bankptr(10, memory_region(machine, RGNCLASS_USER, "cageboot"));
+	memory_set_bankptr(10, memory_region(machine, "cageboot"));
-	memory_set_bankptr(11, memory_region(machine, RGNCLASS_SOUND, "cage"));
+	memory_set_bankptr(11, memory_region(machine, "cage"));
 
 	cage_cpu = mame_find_cpu_index(machine, "cage");
 	cage_cpu_clock_period = ATTOTIME_IN_HZ(cpunum_get_clock(cage_cpu));

src/mame/audio/cclimber.c

@@ -17,16 +17,16 @@ static INT16 *samplebuf;	/* buffer to decode samples at run time */
 static void cclimber_sh_start(void)
 {
 	samplebuf = 0;
-	if (memory_region(Machine, RGNCLASS_SOUND, "samples"))
+	if (memory_region(Machine, "samples"))
-		samplebuf = auto_malloc(sizeof(*samplebuf)*2*memory_region_length(Machine, RGNCLASS_SOUND, "samples"));
+		samplebuf = auto_malloc(sizeof(*samplebuf)*2*memory_region_length(Machine, "samples"));
 }
 
 
 static void cclimber_play_sample(int start,int freq,int volume)
 {
 	int len;
-	int romlen = memory_region_length(Machine, RGNCLASS_SOUND, "samples");
+	int romlen = memory_region_length(Machine, "samples");
-	const UINT8 *rom = memory_region(Machine, RGNCLASS_SOUND, "samples");
+	const UINT8 *rom = memory_region(Machine, "samples");
 
 
 	if (!rom) return;

src/mame/audio/cinemat.c

@@ -1602,7 +1602,7 @@ static MACHINE_RESET( qb3_sound )
 
 	/* this patch prevents the sound ROM from eating itself when command $0A is sent */
 	/* on a cube rotate */
-	memory_region(machine, RGNCLASS_CPU, "audio")[0x11dc] = 0x09;
+	memory_region(machine, "audio")[0x11dc] = 0x09;
 }
 
 

src/mame/audio/circus.c

@@ -175,7 +175,7 @@ DISCRETE_SOUND_END
 WRITE8_HANDLER( circus_clown_z_w )
 {
 	clown_z = (data & 0x0f);
-	*(memory_region(machine, RGNCLASS_CPU, "main")+0x8000)=data; logerror("Z:%02x\n",data); //DEBUG
+	*(memory_region(machine, "main")+0x8000)=data; logerror("Z:%02x\n",data); //DEBUG
 	/* Bits 4-6 enable/disable trigger different events */
 
 	switch (circus_game)

src/mame/audio/cps3.c

@@ -28,7 +28,7 @@ static struct
 static void cps3_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
 {
 	int i;
-	INT8 *base = (INT8*)memory_region(Machine, RGNCLASS_USER, "user5");
+	INT8 *base = (INT8*)memory_region(Machine, "user5");
 
 	/* Clear the buffers */
 	memset(buffer[0], 0, length*sizeof(*buffer[0]));

src/mame/audio/cyberbal.c

@@ -23,7 +23,7 @@ static void update_sound_68k_interrupts(running_machine *machine);
 void cyberbal_sound_reset(running_machine *machine)
 {
 	/* reset the sound system */
-	bank_base = &memory_region(machine, RGNCLASS_CPU, "audio")[0x10000];
+	bank_base = &memory_region(machine, "audio")[0x10000];
 	memory_set_bankptr(8, &bank_base[0x0000]);
 	fast_68k_int = io_68k_int = 0;
 	sound_data_from_68k = sound_data_from_6502 = 0;

src/mame/audio/dcs.c

@@ -919,8 +919,8 @@ void dcs_init(void)
 	cpunum_set_info_fct(dcs.cpunum, CPUINFO_PTR_ADSP2100_TIMER_HANDLER, (genf *)timer_enable_callback);
 
 	/* configure boot and sound ROMs */
-	dcs.bootrom = (UINT16 *)memory_region(Machine, RGNCLASS_SOUND, "dcs");
+	dcs.bootrom = (UINT16 *)memory_region(Machine, "dcs");
-	dcs.bootrom_words = memory_region_length(Machine, RGNCLASS_SOUND, "dcs") / 2;
+	dcs.bootrom_words = memory_region_length(Machine, "dcs") / 2;
 	dcs.sounddata = dcs.bootrom;
 	dcs.sounddata_words = dcs.bootrom_words;
 	dcs.sounddata_banks = dcs.sounddata_words / 0x1000;
@@ -970,8 +970,8 @@ void dcs2_init(running_machine *machine, int dram_in_mb, offs_t polling_offset)
 	cpunum_set_info_fct(dcs.cpunum, CPUINFO_PTR_ADSP2100_TIMER_HANDLER, (genf *)timer_enable_callback);
 
 	/* always boot from the base of "dcs" */
-	dcs.bootrom = (UINT16 *)memory_region(machine, RGNCLASS_SOUND, "dcs");
+	dcs.bootrom = (UINT16 *)memory_region(machine, "dcs");
-	dcs.bootrom_words = memory_region_length(machine, RGNCLASS_SOUND, "dcs") / 2;
+	dcs.bootrom_words = memory_region_length(machine, "dcs") / 2;
 
 	/* supports both RAM and ROM variants */
 	if (dram_in_mb != 0)

src/mame/audio/dkong.c

@@ -1058,7 +1058,7 @@ static READ8_HANDLER( dkong_voice_status_r )
 static READ8_HANDLER( dkong_sh_tune_r )
 {
 	dkong_state *state = machine->driver_data;
-	UINT8 *SND = memory_region(machine, RGNCLASS_CPU, "sound");
+	UINT8 *SND = memory_region(machine, "sound");
 
 	if ( state->page & 0x40 )
 	{

src/mame/audio/exidy440.c

@@ -164,7 +164,7 @@ static void *exidy440_sh_start(int clock, const struct CustomSound_interface *co
 	stream = stream_create(0, 2, clock, NULL, channel_update);
 
 	/* allocate the sample cache */
-	length = memory_region_length(Machine, RGNCLASS_SOUND, "cvsd") * 16 + MAX_CACHE_ENTRIES * sizeof(sound_cache_entry);
+	length = memory_region_length(Machine, "cvsd") * 16 + MAX_CACHE_ENTRIES * sizeof(sound_cache_entry);
 	sound_cache = auto_malloc(length);
 
 	/* determine the hard end of the cache and reset */
@@ -653,7 +653,7 @@ static INT16 *find_or_add_to_sound_cache(int address, int length, int bits, int
 		if (current->address == address && current->length == length && current->bits == bits && current->frequency == frequency)
 			return current->data;
 
-	return add_to_sound_cache(&memory_region(Machine, RGNCLASS_SOUND, "cvsd")[address], address, length, bits, frequency);
+	return add_to_sound_cache(&memory_region(Machine, "cvsd")[address], address, length, bits, frequency);
 }
 
 

src/mame/audio/fghtbskt.c

@@ -18,8 +18,8 @@ WRITE8_HANDLER( fghtbskt_samples_w )
 
 void fghtbskt_sh_start(void)
 {
-	int i, len = memory_region_length(Machine, RGNCLASS_SOUND, "samples");
+	int i, len = memory_region_length(Machine, "samples");
-	UINT8 *ROM = memory_region(Machine, RGNCLASS_SOUND, "samples");
+	UINT8 *ROM = memory_region(Machine, "samples");
 
 	samplebuf = auto_malloc(len * 2);
 

src/mame/audio/flower.c

@@ -175,8 +175,8 @@ void * flower_sh_start(int clock, const struct CustomSound_interface *config)
 	num_voices = 8;
 	last_channel = channel_list + num_voices;
 
-	sound_rom1 = memory_region(Machine, RGNCLASS_SOUND, "sound1");
+	sound_rom1 = memory_region(Machine, "sound1");
-	sound_rom2 = memory_region(Machine, RGNCLASS_SOUND, "sound2");
+	sound_rom2 = memory_region(Machine, "sound2");
 
 	/* start with sound enabled, many games don't have a sound enable register */
 	sound_enable = 1;

src/mame/audio/gomoku.c

@@ -183,7 +183,7 @@ void *gomoku_sh_start(int clock, const struct CustomSound_interface *config)
 	num_voices = MAX_VOICES;
 	last_channel = channel_list + num_voices;
 
-	sound_rom = memory_region(Machine, RGNCLASS_SOUND, "gomoku");
+	sound_rom = memory_region(Machine, "gomoku");
 
 	/* start with sound enabled, many games don't have a sound enable register */
 	sound_enable = 1;

src/mame/audio/harddriv.c

@@ -51,8 +51,8 @@ static UINT64 last_bio_cycles;
 
 void hdsnd_init(running_machine *machine)
 {
-	rombase = (UINT8 *)memory_region(machine, RGNCLASS_SOUND, "serialroms");
+	rombase = (UINT8 *)memory_region(machine, "serialroms");
-	romsize = memory_region_length(machine, RGNCLASS_SOUND, "serialroms");
+	romsize = memory_region_length(machine, "serialroms");
 	comram = (UINT16 *)auto_malloc(0x400);
 	last_bio_cycles = 0;
 }

src/mame/audio/leland.c

@@ -519,7 +519,7 @@ void *leland_80186_sh_start(int clock, const struct CustomSound_interface *confi
 	/* if we have a 2151, install an externally driven DAC stream */
 	if (has_ym2151)
 	{
-		ext_base = memory_region(Machine, RGNCLASS_SOUND, "dac");
+		ext_base = memory_region(Machine, "dac");
 		extern_stream = stream_create(0, 1, OUTPUT_RATE, NULL, leland_80186_extern_update);
 	}
 

src/mame/audio/m72.c

@@ -198,11 +198,11 @@ WRITE8_HANDLER( poundfor_sample_addr_w )
 
 READ8_HANDLER( m72_sample_r )
 {
-	return memory_region(machine, RGNCLASS_SOUND, "samples")[sample_addr];
+	return memory_region(machine, "samples")[sample_addr];
 }
 
 WRITE8_HANDLER( m72_sample_w )
 {
 	DAC_signed_data_w(0,data);
-	sample_addr = (sample_addr + 1) & (memory_region_length(machine, RGNCLASS_SOUND, "samples") - 1);
+	sample_addr = (sample_addr + 1) & (memory_region_length(machine, "samples") - 1);
 }

src/mame/audio/mario.c

@@ -237,7 +237,7 @@ static SOUND_START( mario )
 {
 	mario_state	*state = machine->driver_data;
 #if USE_8039
-	UINT8 *SND = memory_region(machine, RGNCLASS_CPU, "audio");
+	UINT8 *SND = memory_region(machine, "audio");
 
 	SND[1] = 0x01;
 #endif
@@ -298,8 +298,8 @@ static READ8_HANDLER( mario_sh_ea_r )
 
 static READ8_HANDLER( mario_sh_tune_r )
 {
-	UINT8 *SND = memory_region(machine, RGNCLASS_CPU, "audio");
+	UINT8 *SND = memory_region(machine, "audio");
-	UINT16 mask = memory_region_length(machine, RGNCLASS_CPU, "audio")-1;
+	UINT16 mask = memory_region_length(machine, "audio")-1;
 	UINT8 p2 = I8035_P2_R(machine);
 
 	if ((p2 >> 7) & 1)

src/mame/audio/mcr.c

@@ -269,7 +269,7 @@ void mcr_sound_reset(void)
 */
 static void ssio_compute_ay8910_modulation(void)
 {
-	UINT8 *prom = memory_region(Machine, RGNCLASS_PROMS, "proms");
+	UINT8 *prom = memory_region(Machine, "proms");
 	int volval;
 
 	/* loop over all possible values of the duty cycle */

src/mame/audio/namcoc7x.c

@@ -56,7 +56,7 @@ void namcoc7x_sound_write16(UINT16 command, UINT32 offset)
 
 void namcoc7x_on_driver_init(running_machine *machine)
 {
-	UINT8 *pROM = (UINT8 *)memory_region(machine, RGNCLASS_USER, "user4");
+	UINT8 *pROM = (UINT8 *)memory_region(machine, "user4");
 	int cpunum;
 
 	// clear the first page of the data ROM
@@ -105,10 +105,10 @@ static WRITE16_HANDLER( c7x_shared_w )
 ADDRESS_MAP_START( namcoc7x_mcu_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x002000, 0x002fff) AM_READWRITE( c352_0_r, c352_0_w )
 	AM_RANGE(0x004000, 0x00bfff) AM_RAM AM_BASE(&namcoc7x_mcuram)
-	AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0x8c000)
+	AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("user4", 0x8c000)
-	AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0)
+	AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("user4", 0)
-	AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0)
+	AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION("user4", 0)
-	AM_RANGE(0x280000, 0x2fffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0)
+	AM_RANGE(0x280000, 0x2fffff) AM_ROM AM_REGION("user4", 0)
 	AM_RANGE(0x301000, 0x301001) AM_NOP	// watchdog? LEDs?
 	AM_RANGE(0x308000, 0x308003) AM_NOP	// volume control IC?
 ADDRESS_MAP_END
@@ -116,10 +116,10 @@ ADDRESS_MAP_END
 ADDRESS_MAP_START( namcoc7x_mcu_share_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x002000, 0x002fff) AM_READWRITE( c352_0_r, c352_0_w )
 	AM_RANGE(0x004000, 0x00bfff) AM_RAM AM_READWRITE( c7x_shared_r, c7x_shared_w ) AM_BASE(&namcoc7x_mcuram)
-	AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0x8c000)
+	AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("user4", 0x8c000)
-	AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0)
+	AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("user4", 0)
-	AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0)
+	AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION("user4", 0)
-	AM_RANGE(0x280000, 0x2fffff) AM_ROM AM_REGION(RGNCLASS_USER, "user4", 0)
+	AM_RANGE(0x280000, 0x2fffff) AM_ROM AM_REGION("user4", 0)
 	AM_RANGE(0x301000, 0x301001) AM_NOP	// watchdog? LEDs?
 	AM_RANGE(0x308000, 0x308003) AM_NOP	// volume control IC?
 ADDRESS_MAP_END

src/mame/audio/polepos.c

@@ -70,7 +70,7 @@ static void engine_sound_update(void *param, stream_sample_t **inputs, stream_sa
 	/* determine the volume */
 	slot = (sample_msb >> 3) & 7;
 	volume = volume_table[slot];
-	base = &memory_region(Machine, RGNCLASS_SOUND, "engine")[slot * 0x800];
+	base = &memory_region(Machine, "engine")[slot * 0x800];
 
 	/* fill in the sample */
 	while (length--)

src/mame/audio/rockola.c

@@ -119,7 +119,7 @@ INLINE void validate_tone_channel(running_machine *machine, int channel)
 {
 	if (!tone_channels[channel].mute)
 	{
-		UINT8 *ROM = memory_region(machine, RGNCLASS_SOUND, "rockola");
+		UINT8 *ROM = memory_region(machine, "rockola");
 		UINT8 romdata = ROM[tone_channels[channel].base + tone_channels[channel].offset];
 
 		if (romdata != 0xff)

src/mame/audio/scramble.c

@@ -332,7 +332,7 @@ static TIMER_CALLBACK( ad2083_step )
 
 static int ad2083_speech_rom_read_bit(void)
 {
-	UINT8 *ROM = memory_region(Machine, RGNCLASS_SOUND, "tms5110");
+	UINT8 *ROM = memory_region(Machine, "tms5110");
 	int bit;
 
 	speech_rom_address %= 4096;

src/mame/audio/segag80r.c

@@ -510,7 +510,7 @@ WRITE8_HANDLER( sega005_sound_a_w )
 
 INLINE void sega005_update_sound_data(running_machine *machine)
 {
-	UINT8 newval = memory_region(machine, RGNCLASS_SOUND, "005")[sound_addr];
+	UINT8 newval = memory_region(machine, "005")[sound_addr];
 	UINT8 diff = newval ^ sound_data;
 
 	//mame_printf_debug("  [%03X] = %02X\n", sound_addr, newval);
@@ -594,7 +594,7 @@ static void *sega005_custom_start(int clock, const struct CustomSound_interface
 
 static void sega005_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
 {
-	const UINT8 *sound_prom = memory_region(Machine, RGNCLASS_PROMS, "proms");
+	const UINT8 *sound_prom = memory_region(Machine, "proms");
 	int i;
 
 	/* no implementation yet */
@@ -889,7 +889,7 @@ static WRITE8_HANDLER( monsterb_sound_a_w )
 	tms36xx_note_w(0, 0, data & 15);
 
 	/* Top four data lines address an 82S123 ROM that enables/disables voices */
-	enable_val = memory_region(machine, RGNCLASS_SOUND, "prom")[(data & 0xF0) >> 4];
+	enable_val = memory_region(machine, "prom")[(data & 0xF0) >> 4];
 	tms3617_enable_w(0, enable_val >> 2);
 }
 
@@ -957,7 +957,7 @@ static WRITE8_HANDLER( n7751_rom_offset_w )
 static WRITE8_HANDLER( n7751_rom_select_w )
 {
 	/* P7 - ROM selects */
-	int numroms = memory_region_length(machine, RGNCLASS_SOUND, "n7751") / 0x1000;
+	int numroms = memory_region_length(machine, "n7751") / 0x1000;
 	sound_addr &= 0xfff;
 	if (!(data & 0x01) && numroms >= 1) sound_addr |= 0x0000;
 	if (!(data & 0x02) && numroms >= 2) sound_addr |= 0x1000;
@@ -969,7 +969,7 @@ static WRITE8_HANDLER( n7751_rom_select_w )
 static READ8_HANDLER( n7751_rom_r )
 {
 	/* read from BUS */
-	return memory_region(machine, RGNCLASS_SOUND, "n7751")[sound_addr];
+	return memory_region(machine, "n7751")[sound_addr];
 }
 
 

src/mame/audio/segasnd.c

@@ -171,7 +171,7 @@ static READ8_HANDLER( speech_p1_r )
 
 static READ8_HANDLER( speech_rom_r )
 {
-	return memory_region(machine, RGNCLASS_SOUND, "speech")[0x100 * (speech_p2 & 0x3f) + offset];
+	return memory_region(machine, "speech")[0x100 * (speech_p2 & 0x3f) + offset];
 }
 
 static WRITE8_HANDLER( speech_p1_w )

src/mame/audio/seibu.c

@@ -106,7 +106,7 @@ static UINT8 decrypt_opcode(int a,int src)
 void seibu_sound_decrypt(running_machine *machine,const char *cpu,int length)
 {
 	UINT8 *decrypt = auto_malloc(length);
-	UINT8 *rom = memory_region(machine, RGNCLASS_CPU, cpu);
+	UINT8 *rom = memory_region(machine, cpu);
 	int i;
 
 	memory_set_decrypted_region(mame_find_cpu_index(machine, cpu), 0x0000, (length < 0x10000) ? (length - 1) : 0x1fff, decrypt);
@@ -179,7 +179,7 @@ static void *seibu_adpcm_start(int clock, const struct CustomSound_interface *co
 			state->allocated = 1;
 			state->playing = 0;
 			state->stream = stream_create(0, 1, clock, state, seibu_adpcm_callback);
-			state->base = memory_region(Machine, RGNCLASS_SOUND, "adpcm");
+			state->base = memory_region(Machine, "adpcm");
 			reset_adpcm(&state->adpcm);
 			return state;
 		}
@@ -198,8 +198,8 @@ static void seibu_adpcm_stop(void *token)
 
 void seibu_adpcm_decrypt(running_machine *machine, const char *region)
 {
-	UINT8 *ROM = memory_region(machine, RGNCLASS_SOUND, region);
+	UINT8 *ROM = memory_region(machine, region);
-	int len = memory_region_length(machine, RGNCLASS_SOUND, region);
+	int len = memory_region_length(machine, region);
 	int i;
 
 	for (i = 0; i < len; i++)
@@ -356,8 +356,8 @@ void seibu_ym2203_irqhandler(running_machine *machine, int linestate)
 
 MACHINE_RESET( seibu_sound )
 {
-	int romlength = memory_region_length(machine, RGNCLASS_CPU, "audio");
+	int romlength = memory_region_length(machine, "audio");
-	UINT8 *rom = memory_region(machine, RGNCLASS_CPU, "audio");
+	UINT8 *rom = memory_region(machine, "audio");
 
 	sound_cpu=mame_find_cpu_index(machine, "audio");
 	update_irq_lines(machine, VECTOR_INIT);

src/mame/audio/snes.c

@@ -1141,7 +1141,7 @@ void *snes_sh_start(int clock, const struct CustomSound_interface *config)
 	UINT8 ii;
 
 	/* put IPL image at the top of RAM */
-	memcpy(snes_ipl_region, memory_region(Machine, RGNCLASS_USER, "user5"), 64);
+	memcpy(snes_ipl_region, memory_region(Machine, "user5"), 64);
 
 	/* default to ROM visible */
 	spc_ram[0xf1] = 0x80;
@@ -1293,7 +1293,7 @@ WRITE8_HANDLER( spc_io_w )
 			{
 				if (data & 0x80)
 				{
-					memcpy(snes_ipl_region, memory_region(machine, RGNCLASS_USER, "user5"), 64);
+					memcpy(snes_ipl_region, memory_region(machine, "user5"), 64);
 				}
 				else
 				{

src/mame/audio/suna8.c

@@ -36,8 +36,8 @@ WRITE8_HANDLER( suna8_samples_number_w )
 
 void suna8_sh_start(void)
 {
-	int i, len = memory_region_length(Machine, RGNCLASS_SOUND, "samples");
+	int i, len = memory_region_length(Machine, "samples");
-	UINT8 *ROM = memory_region(Machine, RGNCLASS_SOUND, "samples");
+	UINT8 *ROM = memory_region(Machine, "samples");
 
 	samplebuf = auto_malloc(len * sizeof(samplebuf[0]));
 

src/mame/audio/taito_en.c

@@ -36,7 +36,7 @@ WRITE16_HANDLER(f3_68000_share_w)
 
 WRITE16_HANDLER( f3_es5505_bank_w )
 {
-	UINT32 max_banks_this_game=(memory_region_length(machine, RGNCLASS_SOUND, "ensoniq.0")/0x200000)-1;
+	UINT32 max_banks_this_game=(memory_region_length(machine, "ensoniq.0")/0x200000)-1;
 
 #if 0
 {
@@ -190,7 +190,7 @@ READ16_HANDLER(es5510_dsp_r)
 
 WRITE16_HANDLER(es5510_dsp_w)
 {
-	UINT8 *snd_mem = (UINT8 *)memory_region(machine, RGNCLASS_SOUND, "ensoniq.0");
+	UINT8 *snd_mem = (UINT8 *)memory_region(machine, "ensoniq.0");
 
 //  if (offset>4 && offset!=0x80  && offset!=0xa0  && offset!=0xc0  && offset!=0xe0)
 //      logerror("%06x: DSP write offset %04x %04x\n",activecpu_get_pc(),offset,data);
@@ -248,7 +248,7 @@ ADDRESS_MAP_END
 void taito_f3_soundsystem_reset(running_machine *machine)
 {
 	/* Sound cpu program loads to 0xc00000 so we use a bank */
-	UINT16 *ROM = (UINT16 *)memory_region(machine, RGNCLASS_CPU, "audio");
+	UINT16 *ROM = (UINT16 *)memory_region(machine, "audio");
 	memory_set_bankptr(1,&ROM[0x80000]);
 	memory_set_bankptr(2,&ROM[0x90000]);
 	memory_set_bankptr(3,&ROM[0xa0000]);

src/mame/audio/targ.c

@@ -112,7 +112,7 @@ WRITE8_HANDLER( targ_audio_2_w )
 {
 	if ((data & 0x01) && !(port_2_last & 0x01))
 	{
-		UINT8 *prom = memory_region(machine, RGNCLASS_SOUND, "targ");
+		UINT8 *prom = memory_region(machine, "targ");
 
 		tone_pointer = (tone_pointer + 1) & 0x0f;
 

src/mame/audio/trackfld.c

@@ -119,7 +119,7 @@ READ8_HANDLER( hyprolyb_speech_r )
 WRITE8_HANDLER( hyprolyb_ADPCM_data_w )
 {
     int cmd,start,end;
-    UINT8 *RAM = memory_region(machine, RGNCLASS_CPU, "adpcm");
+    UINT8 *RAM = memory_region(machine, "adpcm");
 
 
     /* simulate the operation of the 6802 */

src/mame/audio/williams.c

@@ -273,7 +273,7 @@ void williams_cvsd_init(int pianum)
 	pia_config(pianum, &cvsd_pia_intf);
 
 	/* configure master CPU banks */
-	ROM = memory_region(Machine, RGNCLASS_CPU, "cvsd");
+	ROM = memory_region(Machine, "cvsd");
 	for (bank = 0; bank < 16; bank++)
 	{
 		/*
@@ -305,7 +305,7 @@ void williams_narc_init(void)
 	soundalt_cpunum = mame_find_cpu_index(Machine, "narc2");
 
 	/* configure master CPU banks */
-	ROM = memory_region(Machine, RGNCLASS_CPU, "narc1");
+	ROM = memory_region(Machine, "narc1");
 	for (bank = 0; bank < 16; bank++)
 	{
 		/*
@@ -319,7 +319,7 @@ void williams_narc_init(void)
 	memory_set_bankptr(6, &ROM[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]);
 
 	/* configure slave CPU banks */
-	ROM = memory_region(Machine, RGNCLASS_CPU, "narc2");
+	ROM = memory_region(Machine, "narc2");
 	for (bank = 0; bank < 16; bank++)
 	{
 		/*
@@ -348,13 +348,13 @@ void williams_adpcm_init(void)
 	soundalt_cpunum = -1;
 
 	/* configure banks */
-	ROM = memory_region(Machine, RGNCLASS_CPU, "adpcm");
+	ROM = memory_region(Machine, "adpcm");
 	memory_configure_bank(5, 0, 8, &ROM[0x10000], 0x8000);
 	memory_set_bankptr(6, &ROM[0x10000 + 0x4000 + 7 * 0x8000]);
 
 	/* expand ADPCM data */
 	/* it is assumed that U12 is loaded @ 0x00000 and U13 is loaded @ 0x40000 */
-	ROM = memory_region(Machine, RGNCLASS_SOUND, "oki");
+	ROM = memory_region(Machine, "oki");
 	memcpy(ROM + 0x1c0000, ROM + 0x080000, 0x20000);	/* expand individual banks */
 	memcpy(ROM + 0x180000, ROM + 0x0a0000, 0x20000);
 	memcpy(ROM + 0x140000, ROM + 0x0c0000, 0x20000);

src/mame/audio/wiping.c

@@ -181,8 +181,8 @@ void *wiping_sh_start(int clock, const struct CustomSound_interface *config)
 	num_voices = 8;
 	last_channel = channel_list + num_voices;
 
-	sound_rom = memory_region(Machine, RGNCLASS_SOUND, "samples");
+	sound_rom = memory_region(Machine, "samples");
-	sound_prom = memory_region(Machine, RGNCLASS_SOUND, "soundproms");
+	sound_prom = memory_region(Machine, "soundproms");
 
 	/* start with sound enabled, many games don't have a sound enable register */
 	sound_enable = 1;

src/mame/drivers/1942.c

@@ -311,20 +311,20 @@ MACHINE_DRIVER_END
 ***************************************************************************/
 
 ROM_START( 1942 )
-	ROM_REGION( 0x1c000, RGNCLASS_CPU, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
+	ROM_REGION( 0x1c000, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
 	ROM_LOAD( "srb-03.m3", 0x00000, 0x4000, CRC(d9dafcc3) SHA1(a089a9bc55fb7d6d0ac53f91b258396d5d62677a) )
 	ROM_LOAD( "srb-04.m4", 0x04000, 0x4000, CRC(da0cf924) SHA1(856fbb302c9a4ec7850a26ab23dab8467f79bba4) )
 	ROM_LOAD( "srb-05.m5", 0x10000, 0x4000, CRC(d102911c) SHA1(35ba1d82bd901940f61d8619273463d02fc0a952) )
 	ROM_LOAD( "srb-06.m6", 0x14000, 0x2000, CRC(466f8248) SHA1(2ccc8fc59962d3001fbc10e8d2f20a254a74f251) )
 	ROM_LOAD( "srb-07.m7", 0x18000, 0x4000, CRC(0d31038c) SHA1(b588eaf6fddd66ecb2d9832dc197f286f1ccd846) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 )
+	ROM_REGION( 0x10000, "audio", 0 )
 	ROM_LOAD( "sr-01.c11", 0x0000, 0x4000, CRC(bd87f06b) SHA1(821f85cf157f81117eeaba0c3cf0337eac357e58) )
 
-	ROM_REGION( 0x2000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-02.f2", 0x0000, 0x2000, CRC(6ebca191) SHA1(0dbddadde54a0ab66994c4a8726be05c6ca88a0e) )	/* characters */
 
-	ROM_REGION( 0xc000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0xc000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-08.a1", 0x0000, 0x2000, CRC(3884d9eb) SHA1(5cbd9215fa5ba5a61208b383700adc4428521aed) )	/* tiles */
 	ROM_LOAD( "sr-09.a2", 0x2000, 0x2000, CRC(999cf6e0) SHA1(5b8b685038ec98b781908b92eb7fb9506db68544) )
 	ROM_LOAD( "sr-10.a3", 0x4000, 0x2000, CRC(8edb273a) SHA1(85fdd4c690ed31e6396e3c16aa02140ee7ea2d61) )
@@ -332,13 +332,13 @@ ROM_START( 1942 )
 	ROM_LOAD( "sr-12.a5", 0x8000, 0x2000, CRC(1bd3d8bb) SHA1(ef4dce605eb4dc8035985a415315ec61c21419c6) )
 	ROM_LOAD( "sr-13.a6", 0xa000, 0x2000, CRC(658f02c4) SHA1(f087d69e49e38cf3107350cde18fcf85a8fa04f0) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x10000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-14.l1", 0x00000, 0x4000, CRC(2528bec6) SHA1(29f7719f18faad6bd1ec6735cc24e69168361470) )	/* sprites */
 	ROM_LOAD( "sr-15.l2", 0x04000, 0x4000, CRC(f89287aa) SHA1(136fff6d2a4f48a488fc7c620213761459c3ada0) )
 	ROM_LOAD( "sr-16.n1", 0x08000, 0x4000, CRC(024418f8) SHA1(145b8d5d6c8654cd090955a98f6dd8c8dbafe7c1) )
 	ROM_LOAD( "sr-17.n2", 0x0c000, 0x4000, CRC(e2c7e489) SHA1(d4b5d575c021f58f6966df189df94e08c5b3621c) )
 
-	ROM_REGION( 0x0a00, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0a00, "proms", 0 )
 	ROM_LOAD( "sb-5.e8",  0x0000, 0x0100, CRC(93ab8153) SHA1(a792f24e5c0c3c4a6b436102e7a98199f878ece1) )	/* red component */
 	ROM_LOAD( "sb-6.e9",  0x0100, 0x0100, CRC(8ab44f7d) SHA1(f74680a6a987d74b3acb32e6396f20e127874149) )	/* green component */
 	ROM_LOAD( "sb-7.e10", 0x0200, 0x0100, CRC(f4ade9a4) SHA1(62ad31d31d183cce213b03168daa035083b2f28e) )	/* blue component */
@@ -352,20 +352,20 @@ ROM_START( 1942 )
 ROM_END
 
 ROM_START( 1942a )
-	ROM_REGION( 0x1c000, RGNCLASS_CPU, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
+	ROM_REGION( 0x1c000, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
 	ROM_LOAD( "sra-03.m3", 0x00000, 0x4000, CRC(40201bab) SHA1(4886c07a4602223c21419118e10aadce9c99fa5a) )
 	ROM_LOAD( "sr-04.m4",  0x04000, 0x4000, CRC(a60ac644) SHA1(f37862db3cf5e6cc9ab3276f3bc45fd629fd70dd) )
 	ROM_LOAD( "sr-05.m5",  0x10000, 0x4000, CRC(835f7b24) SHA1(24b66827f08c43fbf5b9517d638acdfc38e1b1e7) )
 	ROM_LOAD( "sr-06.m6",  0x14000, 0x2000, CRC(821c6481) SHA1(06becb6bf8b4bde3a458098498eecad566a87711) )
 	ROM_LOAD( "sr-07.m7",  0x18000, 0x4000, CRC(5df525e1) SHA1(70cd2910e2945db76bd6ebfa0ff09a5efadc2d0b) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 )
+	ROM_REGION( 0x10000, "audio", 0 )
 	ROM_LOAD( "sr-01.c11", 0x0000, 0x4000, CRC(bd87f06b) SHA1(821f85cf157f81117eeaba0c3cf0337eac357e58) )
 
-	ROM_REGION( 0x2000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-02.f2", 0x0000, 0x2000, CRC(6ebca191) SHA1(0dbddadde54a0ab66994c4a8726be05c6ca88a0e) )	/* characters */
 
-	ROM_REGION( 0xc000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0xc000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-08.a1", 0x0000, 0x2000, CRC(3884d9eb) SHA1(5cbd9215fa5ba5a61208b383700adc4428521aed) )	/* tiles */
 	ROM_LOAD( "sr-09.a2", 0x2000, 0x2000, CRC(999cf6e0) SHA1(5b8b685038ec98b781908b92eb7fb9506db68544) )
 	ROM_LOAD( "sr-10.a3", 0x4000, 0x2000, CRC(8edb273a) SHA1(85fdd4c690ed31e6396e3c16aa02140ee7ea2d61) )
@@ -373,13 +373,13 @@ ROM_START( 1942a )
 	ROM_LOAD( "sr-12.a5", 0x8000, 0x2000, CRC(1bd3d8bb) SHA1(ef4dce605eb4dc8035985a415315ec61c21419c6) )
 	ROM_LOAD( "sr-13.a6", 0xa000, 0x2000, CRC(658f02c4) SHA1(f087d69e49e38cf3107350cde18fcf85a8fa04f0) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x10000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-14.l1", 0x00000, 0x4000, CRC(2528bec6) SHA1(29f7719f18faad6bd1ec6735cc24e69168361470) )	/* sprites */
 	ROM_LOAD( "sr-15.l2", 0x04000, 0x4000, CRC(f89287aa) SHA1(136fff6d2a4f48a488fc7c620213761459c3ada0) )
 	ROM_LOAD( "sr-16.n1", 0x08000, 0x4000, CRC(024418f8) SHA1(145b8d5d6c8654cd090955a98f6dd8c8dbafe7c1) )
 	ROM_LOAD( "sr-17.n2", 0x0c000, 0x4000, CRC(e2c7e489) SHA1(d4b5d575c021f58f6966df189df94e08c5b3621c) )
 
-	ROM_REGION( 0x0a00, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0a00, "proms", 0 )
 	ROM_LOAD( "sb-5.e8",  0x0000, 0x0100, CRC(93ab8153) SHA1(a792f24e5c0c3c4a6b436102e7a98199f878ece1) )	/* red component */
 	ROM_LOAD( "sb-6.e9",  0x0100, 0x0100, CRC(8ab44f7d) SHA1(f74680a6a987d74b3acb32e6396f20e127874149) )	/* green component */
 	ROM_LOAD( "sb-7.e10", 0x0200, 0x0100, CRC(f4ade9a4) SHA1(62ad31d31d183cce213b03168daa035083b2f28e) )	/* blue component */
@@ -393,20 +393,20 @@ ROM_START( 1942a )
 ROM_END
 
 ROM_START( 1942b )
-	ROM_REGION( 0x1c000, RGNCLASS_CPU, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
+	ROM_REGION( 0x1c000, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
 	ROM_LOAD( "sr-03.m3", 0x00000, 0x4000, CRC(612975f2) SHA1(f3744335862dd4c53925cc32792badd4a378c837) )
 	ROM_LOAD( "sr-04.m4", 0x04000, 0x4000, CRC(a60ac644) SHA1(f37862db3cf5e6cc9ab3276f3bc45fd629fd70dd) )
 	ROM_LOAD( "sr-05.m5", 0x10000, 0x4000, CRC(835f7b24) SHA1(24b66827f08c43fbf5b9517d638acdfc38e1b1e7) )
 	ROM_LOAD( "sr-06.m6", 0x14000, 0x2000, CRC(821c6481) SHA1(06becb6bf8b4bde3a458098498eecad566a87711) )
 	ROM_LOAD( "sr-07.m7", 0x18000, 0x4000, CRC(5df525e1) SHA1(70cd2910e2945db76bd6ebfa0ff09a5efadc2d0b) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 )
+	ROM_REGION( 0x10000, "audio", 0 )
 	ROM_LOAD( "sr-01.c11", 0x0000, 0x4000, CRC(bd87f06b) SHA1(821f85cf157f81117eeaba0c3cf0337eac357e58) )
 
-	ROM_REGION( 0x2000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-02.f2", 0x0000, 0x2000, CRC(6ebca191) SHA1(0dbddadde54a0ab66994c4a8726be05c6ca88a0e) )	/* characters */
 
-	ROM_REGION( 0xc000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0xc000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-08.a1", 0x0000, 0x2000, CRC(3884d9eb) SHA1(5cbd9215fa5ba5a61208b383700adc4428521aed) )	/* tiles */
 	ROM_LOAD( "sr-09.a2", 0x2000, 0x2000, CRC(999cf6e0) SHA1(5b8b685038ec98b781908b92eb7fb9506db68544) )
 	ROM_LOAD( "sr-10.a3", 0x4000, 0x2000, CRC(8edb273a) SHA1(85fdd4c690ed31e6396e3c16aa02140ee7ea2d61) )
@@ -414,13 +414,13 @@ ROM_START( 1942b )
 	ROM_LOAD( "sr-12.a5", 0x8000, 0x2000, CRC(1bd3d8bb) SHA1(ef4dce605eb4dc8035985a415315ec61c21419c6) )
 	ROM_LOAD( "sr-13.a6", 0xa000, 0x2000, CRC(658f02c4) SHA1(f087d69e49e38cf3107350cde18fcf85a8fa04f0) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x10000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-14.l1", 0x00000, 0x4000, CRC(2528bec6) SHA1(29f7719f18faad6bd1ec6735cc24e69168361470) )	/* sprites */
 	ROM_LOAD( "sr-15.l2", 0x04000, 0x4000, CRC(f89287aa) SHA1(136fff6d2a4f48a488fc7c620213761459c3ada0) )
 	ROM_LOAD( "sr-16.n1", 0x08000, 0x4000, CRC(024418f8) SHA1(145b8d5d6c8654cd090955a98f6dd8c8dbafe7c1) )
 	ROM_LOAD( "sr-17.n2", 0x0c000, 0x4000, CRC(e2c7e489) SHA1(d4b5d575c021f58f6966df189df94e08c5b3621c) )
 
-	ROM_REGION( 0x0a00, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0a00, "proms", 0 )
 	ROM_LOAD( "sb-5.e8",  0x0000, 0x0100, CRC(93ab8153) SHA1(a792f24e5c0c3c4a6b436102e7a98199f878ece1) )	/* red component */
 	ROM_LOAD( "sb-6.e9",  0x0100, 0x0100, CRC(8ab44f7d) SHA1(f74680a6a987d74b3acb32e6396f20e127874149) )	/* green component */
 	ROM_LOAD( "sb-7.e10", 0x0200, 0x0100, CRC(f4ade9a4) SHA1(62ad31d31d183cce213b03168daa035083b2f28e) )	/* blue component */
@@ -434,20 +434,20 @@ ROM_START( 1942b )
 ROM_END
 
 ROM_START( 1942w )
-	ROM_REGION( 0x1c000, RGNCLASS_CPU, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
+	ROM_REGION( 0x1c000, "main", 0 )	/* 64k for code + 3*16k for the banked ROMs images */
 	ROM_LOAD( "sw-03.m3", 0x00000, 0x4000, CRC(afd79770) SHA1(74c7a887fe3d4abfce1dcfec4c75b21ab81adc8c) )
 	ROM_LOAD( "sw-04.m4", 0x04000, 0x4000, CRC(933d9910) SHA1(9c73ef880f56e30a865be959f8bbdbe79c7ef8e2) )
 	ROM_LOAD( "sw-05.m5", 0x10000, 0x4000, CRC(e9a71bb6) SHA1(1f0d52c9282d15f9e4898b3b144ece25d345b71f) )
 	ROM_LOAD( "sw-06.m6", 0x14000, 0x2000, CRC(466f8248) SHA1(2ccc8fc59962d3001fbc10e8d2f20a254a74f251) )	/* matches srb-06.m6 from 1942 (Revision B) */
 	ROM_LOAD( "sw-07.m7", 0x18000, 0x4000, CRC(ec41655e) SHA1(dbe4bb11f2e88574cb43ba5cd216354c3b7f69a6) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 )
+	ROM_REGION( 0x10000, "audio", 0 )
 	ROM_LOAD( "sr-01.c11", 0x0000, 0x4000, CRC(bd87f06b) SHA1(821f85cf157f81117eeaba0c3cf0337eac357e58) )
 
-	ROM_REGION( 0x2000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "sw-02.f2", 0x0000, 0x2000, CRC(f8e9ada2) SHA1(028f554e70425c53faa30a6fe1c45cc16724560a) )	/* characters */
 
-	ROM_REGION( 0xc000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0xc000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-08.a1", 0x0000, 0x2000, CRC(3884d9eb) SHA1(5cbd9215fa5ba5a61208b383700adc4428521aed) )	/* tiles */
 	ROM_LOAD( "sr-09.a2", 0x2000, 0x2000, CRC(999cf6e0) SHA1(5b8b685038ec98b781908b92eb7fb9506db68544) )
 	ROM_LOAD( "sr-10.a3", 0x4000, 0x2000, CRC(8edb273a) SHA1(85fdd4c690ed31e6396e3c16aa02140ee7ea2d61) )
@@ -455,13 +455,13 @@ ROM_START( 1942w )
 	ROM_LOAD( "sr-12.a5", 0x8000, 0x2000, CRC(1bd3d8bb) SHA1(ef4dce605eb4dc8035985a415315ec61c21419c6) )
 	ROM_LOAD( "sr-13.a6", 0xa000, 0x2000, CRC(658f02c4) SHA1(f087d69e49e38cf3107350cde18fcf85a8fa04f0) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x10000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "sr-14.l1", 0x00000, 0x4000, CRC(2528bec6) SHA1(29f7719f18faad6bd1ec6735cc24e69168361470) )	/* sprites */
 	ROM_LOAD( "sr-15.l2", 0x04000, 0x4000, CRC(f89287aa) SHA1(136fff6d2a4f48a488fc7c620213761459c3ada0) )
 	ROM_LOAD( "sr-16.n1", 0x08000, 0x4000, CRC(024418f8) SHA1(145b8d5d6c8654cd090955a98f6dd8c8dbafe7c1) )
 	ROM_LOAD( "sr-17.n2", 0x0c000, 0x4000, CRC(e2c7e489) SHA1(d4b5d575c021f58f6966df189df94e08c5b3621c) )
 
-	ROM_REGION( 0x0a00, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0a00, "proms", 0 )
 	ROM_LOAD( "sb-5.e8",  0x0000, 0x0100, CRC(93ab8153) SHA1(a792f24e5c0c3c4a6b436102e7a98199f878ece1) )	/* red component */
 	ROM_LOAD( "sb-6.e9",  0x0100, 0x0100, CRC(8ab44f7d) SHA1(f74680a6a987d74b3acb32e6396f20e127874149) )	/* green component */
 	ROM_LOAD( "sb-7.e10", 0x0200, 0x0100, CRC(f4ade9a4) SHA1(62ad31d31d183cce213b03168daa035083b2f28e) )	/* blue component */
@@ -477,7 +477,7 @@ ROM_END
 
 static DRIVER_INIT( 1942 )
 {
-	UINT8 *ROM = memory_region(machine, RGNCLASS_CPU, "main");
+	UINT8 *ROM = memory_region(machine, "main");
 	memory_configure_bank(1, 0, 3, &ROM[0x10000], 0x4000);
 }
 

src/mame/drivers/1943.c

@@ -292,18 +292,18 @@ MACHINE_DRIVER_END
 /* ROMs */
 
 ROM_START( 1943 )
-	ROM_REGION( 0x30000, RGNCLASS_CPU, "main", 0 )	/* 64k for code + 128k for the banked ROMs images */
+	ROM_REGION( 0x30000, "main", 0 )	/* 64k for code + 128k for the banked ROMs images */
 	ROM_LOAD( "1943.01",      0x00000, 0x08000, CRC(c686cc5c) SHA1(5efb2d9df737564d599f71b71a6438f7624b27c3) )
 	ROM_LOAD( "1943.02",      0x10000, 0x10000, CRC(d8880a41) SHA1(2f9b6a3922efa05eed66c63284bace5f337304ac) )
 	ROM_LOAD( "1943.03",      0x20000, 0x10000, CRC(3f0ee26c) SHA1(8da74fe91a6be3f23fc625f2a433f1f79c424994) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 )
+	ROM_REGION( 0x10000, "audio", 0 )
 	ROM_LOAD( "1943.05",      0x00000, 0x8000, CRC(ee2bd2d7) SHA1(4d2d019a9f8452fbbb247e893280568a2e86073e) )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.04",      0x00000, 0x8000, CRC(46cb9d3d) SHA1(96fd0e714b91fe13a2ca0d185ada9e4b4baa0c0b) )	/* characters */
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.15",      0x00000, 0x8000, CRC(6b1a0443) SHA1(32337c840ccd6815fd5844c194365c58d708f6dc) )	/* bg tiles */
 	ROM_LOAD( "1943.16",      0x08000, 0x8000, CRC(23c908c2) SHA1(42b83ff5781be9181802a21ff1b23c17ab1bc5a2) )
 	ROM_LOAD( "1943.17",      0x10000, 0x8000, CRC(46bcdd07) SHA1(38feda668be25d1adc04aa36afc73b07c1545f89) )
@@ -313,11 +313,11 @@ ROM_START( 1943 )
 	ROM_LOAD( "1943.21",      0x30000, 0x8000, CRC(9bfb0d89) SHA1(f1bae7ec46edcf46c7af84c054e89b322f8c8972) )
 	ROM_LOAD( "1943.22",      0x38000, 0x8000, CRC(04f3c274) SHA1(932780c04abe285e1ec67b726b145175f73eafe0) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x10000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.24",      0x00000, 0x8000, CRC(11134036) SHA1(88da112ab9fc7e0d8f0e901f273715b950ae588c) )	/* fg tiles */
 	ROM_LOAD( "1943.25",      0x08000, 0x8000, CRC(092cf9c1) SHA1(19fe3c714b1d52cbb21dea25cdee5af841f525db) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx4", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx4", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.06",      0x00000, 0x8000, CRC(97acc8af) SHA1(c9fa07cb61f6905408b355edabfe453fb652ff0d) )	/* sprites */
 	ROM_LOAD( "1943.07",      0x08000, 0x8000, CRC(d78f7197) SHA1(6367c7e80e80d4a0d33d7840b5c843c63c80123e) )
 	ROM_LOAD( "1943.08",      0x10000, 0x8000, CRC(1a626608) SHA1(755c27a07728fd686168e9d9e4dee3d8f274892a) )
@@ -327,11 +327,11 @@ ROM_START( 1943 )
 	ROM_LOAD( "1943.12",      0x30000, 0x8000, CRC(5e7efdb7) SHA1(fef271a38dc1a9e45a0c6e27e28e713c77c8f8c9) )
 	ROM_LOAD( "1943.13",      0x38000, 0x8000, CRC(1143829a) SHA1(2b3a65e354a205c05a87f783e9938b64bc62396f) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx5", 0 )	/* tilemaps */
+	ROM_REGION( 0x10000, "gfx5", 0 )	/* tilemaps */
 	ROM_LOAD( "1943.14",      0x0000, 0x8000, CRC(4d3c6401) SHA1(ce4f6dbf8fa030ad45cbb5afd58df27fed2d4618) )	/* front background */
 	ROM_LOAD( "1943.23",      0x8000, 0x8000, CRC(a52aecbd) SHA1(45b0283d84d394c16c35802463ca95d70d1062d4) )	/* back background */
 
-	ROM_REGION( 0x0c00, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0c00, "proms", 0 )
 	ROM_LOAD( "bmprom.01",    0x0000, 0x0100, CRC(74421f18) SHA1(5b8b59f6f4e5ad358611de50608f47f41a5b0e51) )	/* red component */
 	ROM_LOAD( "bmprom.02",    0x0100, 0x0100, CRC(ac27541f) SHA1(1796c4c9041dfe28e6319576f21df1dbcb8d12bf) )	/* green component */
 	ROM_LOAD( "bmprom.03",    0x0200, 0x0100, CRC(251fb6ff) SHA1(d1118159b3d429d841e4efa938728ebedadd7ec5) )	/* blue component */
@@ -347,18 +347,18 @@ ROM_START( 1943 )
 ROM_END
 
 ROM_START( 1943j )
-	ROM_REGION( 0x30000, RGNCLASS_CPU, "main", 0 )	/* 64k for code + 128k for the banked ROMs images */
+	ROM_REGION( 0x30000, "main", 0 )	/* 64k for code + 128k for the banked ROMs images */
 	ROM_LOAD( "1943jap.001",  0x00000, 0x08000, CRC(f6935937) SHA1(6fe8885d734447c2a667cf80dd545200aad6c767) )
 	ROM_LOAD( "1943jap.002",  0x10000, 0x10000, CRC(af971575) SHA1(af1d8ce73e8671b7b41248ce6486c9b5aaf6a233) )
 	ROM_LOAD( "1943jap.003",  0x20000, 0x10000, CRC(300ec713) SHA1(f66d2356b413a418c887b4085a5315475c7a8bba) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 )
+	ROM_REGION( 0x10000, "audio", 0 )
 	ROM_LOAD( "1943.05",      0x00000, 0x8000, CRC(ee2bd2d7) SHA1(4d2d019a9f8452fbbb247e893280568a2e86073e) )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.04",      0x00000, 0x8000, CRC(46cb9d3d) SHA1(96fd0e714b91fe13a2ca0d185ada9e4b4baa0c0b) )	/* characters */
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.15",      0x00000, 0x8000, CRC(6b1a0443) SHA1(32337c840ccd6815fd5844c194365c58d708f6dc) )	/* bg tiles */
 	ROM_LOAD( "1943.16",      0x08000, 0x8000, CRC(23c908c2) SHA1(42b83ff5781be9181802a21ff1b23c17ab1bc5a2) )
 	ROM_LOAD( "1943.17",      0x10000, 0x8000, CRC(46bcdd07) SHA1(38feda668be25d1adc04aa36afc73b07c1545f89) )
@@ -368,11 +368,11 @@ ROM_START( 1943j )
 	ROM_LOAD( "1943.21",      0x30000, 0x8000, CRC(9bfb0d89) SHA1(f1bae7ec46edcf46c7af84c054e89b322f8c8972) )
 	ROM_LOAD( "1943.22",      0x38000, 0x8000, CRC(04f3c274) SHA1(932780c04abe285e1ec67b726b145175f73eafe0) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x10000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.24",      0x00000, 0x8000, CRC(11134036) SHA1(88da112ab9fc7e0d8f0e901f273715b950ae588c) )	/* fg tiles */
 	ROM_LOAD( "1943.25",      0x08000, 0x8000, CRC(092cf9c1) SHA1(19fe3c714b1d52cbb21dea25cdee5af841f525db) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx4", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx4", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943.06",      0x00000, 0x8000, CRC(97acc8af) SHA1(c9fa07cb61f6905408b355edabfe453fb652ff0d) )	/* sprites */
 	ROM_LOAD( "1943.07",      0x08000, 0x8000, CRC(d78f7197) SHA1(6367c7e80e80d4a0d33d7840b5c843c63c80123e) )
 	ROM_LOAD( "1943.08",      0x10000, 0x8000, CRC(1a626608) SHA1(755c27a07728fd686168e9d9e4dee3d8f274892a) )
@@ -382,11 +382,11 @@ ROM_START( 1943j )
 	ROM_LOAD( "1943.12",      0x30000, 0x8000, CRC(5e7efdb7) SHA1(fef271a38dc1a9e45a0c6e27e28e713c77c8f8c9) )
 	ROM_LOAD( "1943.13",      0x38000, 0x8000, CRC(1143829a) SHA1(2b3a65e354a205c05a87f783e9938b64bc62396f) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx5", 0 )	/* tilemaps */
+	ROM_REGION( 0x10000, "gfx5", 0 )	/* tilemaps */
 	ROM_LOAD( "1943.14",      0x0000, 0x8000, CRC(4d3c6401) SHA1(ce4f6dbf8fa030ad45cbb5afd58df27fed2d4618) )	/* front background */
 	ROM_LOAD( "1943.23",      0x8000, 0x8000, CRC(a52aecbd) SHA1(45b0283d84d394c16c35802463ca95d70d1062d4) )	/* back background */
 
-	ROM_REGION( 0x0c00, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0c00, "proms", 0 )
 	ROM_LOAD( "bmprom.01",    0x0000, 0x0100, CRC(74421f18) SHA1(5b8b59f6f4e5ad358611de50608f47f41a5b0e51) )	/* red component */
 	ROM_LOAD( "bmprom.02",    0x0100, 0x0100, CRC(ac27541f) SHA1(1796c4c9041dfe28e6319576f21df1dbcb8d12bf) )	/* green component */
 	ROM_LOAD( "bmprom.03",    0x0200, 0x0100, CRC(251fb6ff) SHA1(d1118159b3d429d841e4efa938728ebedadd7ec5) )	/* blue component */
@@ -402,18 +402,18 @@ ROM_START( 1943j )
 ROM_END
 
 ROM_START( 1943kai )
-	ROM_REGION( 0x30000, RGNCLASS_CPU, "main", 0 )	/* 64k for code + 128k for the banked ROMs images */
+	ROM_REGION( 0x30000, "main", 0 )	/* 64k for code + 128k for the banked ROMs images */
 	ROM_LOAD( "1943kai.01",   0x00000, 0x08000, CRC(7d2211db) SHA1(b02a0b3daf7e1e224b7cad8fbe93439bd5ec9f0b) )
 	ROM_LOAD( "1943kai.02",   0x10000, 0x10000, CRC(2ebbc8c5) SHA1(3be5ad061411642723e3f2bcb7b3c3caa11ee15f) )
 	ROM_LOAD( "1943kai.03",   0x20000, 0x10000, CRC(475a6ac5) SHA1(fa07a855ba9173b6f81641c806ec7d938b0c282e) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 )
+	ROM_REGION( 0x10000, "audio", 0 )
 	ROM_LOAD( "1943kai.05",   0x00000, 0x8000, CRC(25f37957) SHA1(1e50c2a920eb3b5c881843686db857e9fee5ba1d) )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943kai.04",   0x00000, 0x8000, CRC(884a8692) SHA1(027aa8c868dc07ccd9e27705031107881aef4b91) )	/* characters */
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943kai.15",   0x00000, 0x8000, CRC(6b1a0443) SHA1(32337c840ccd6815fd5844c194365c58d708f6dc) )	/* bg tiles */
 	ROM_LOAD( "1943kai.16",   0x08000, 0x8000, CRC(9416fe0d) SHA1(92fbc8fffa4497747ab80abe20eef361f6525114) )
 	ROM_LOAD( "1943kai.17",   0x10000, 0x8000, CRC(3d5acab9) SHA1(887d45b648fda952ae2137579f383ab8ede1facd) )
@@ -423,11 +423,11 @@ ROM_START( 1943kai )
 	ROM_LOAD( "1943kai.21",   0x30000, 0x8000, CRC(8c7fe74a) SHA1(8846b57d7f47c10ab1f505c359ecf36dcbacb011) )
 	ROM_LOAD( "1943kai.22",   0x38000, 0x8000, CRC(d5ef8a0e) SHA1(2e42b1fbbfe823a33740a56d1334657db56d24d2) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x10000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943kai.24",   0x00000, 0x8000, CRC(bf186ef2) SHA1(cacbb8a61f8a64c3ba4ffde5ca6f07fe120b9a7e) )	/* fg tiles */
 	ROM_LOAD( "1943kai.25",   0x08000, 0x8000, CRC(a755faf1) SHA1(8ee286d6ad7454ae34971f5891ddba4b76c244b0) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx4", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx4", ROMREGION_DISPOSE )
 	ROM_LOAD( "1943kai.06",   0x00000, 0x8000, CRC(5f7e38b3) SHA1(33f69ebe91a0ee45d9107171fed26da475aaab3a) )	/* sprites */
 	ROM_LOAD( "1943kai.07",   0x08000, 0x8000, CRC(ff3751fd) SHA1(bc942ddd46e7b147115e8ac22d24c2d018a7c373) )
 	ROM_LOAD( "1943kai.08",   0x10000, 0x8000, CRC(159d51bd) SHA1(746aa49b18aff0eaf2fb875c573d455416d45a1d) )
@@ -437,11 +437,11 @@ ROM_START( 1943kai )
 	ROM_LOAD( "1943kai.12",   0x30000, 0x8000, CRC(0f50c001) SHA1(0e6367d3f0ba39a00ee0fa6e42ae9d43d12da23d) )
 	ROM_LOAD( "1943kai.13",   0x38000, 0x8000, CRC(fd1acf8e) SHA1(88477ff1e5fbbca251d8cd4f241b42618ba64a80) )
 
-	ROM_REGION( 0x10000, RGNCLASS_GFX, "gfx5", 0 )	/* tilemaps */
+	ROM_REGION( 0x10000, "gfx5", 0 )	/* tilemaps */
 	ROM_LOAD( "1943kai.14",   0x0000, 0x8000, CRC(cf0f5a53) SHA1(dc50f3f937f52910dbd0cedbc232acfed0aa6a42) )	/* front background */
 	ROM_LOAD( "1943kai.23",   0x8000, 0x8000, CRC(17f77ef9) SHA1(8ebb4b440042436ec2db52bad808cced832db77c) )	/* back background */
 
-	ROM_REGION( 0x0c00, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0c00, "proms", 0 )
 	ROM_LOAD( "bmk01.bin",    0x0000, 0x0100, CRC(e001ea33) SHA1(4204bdf87820ac84bab2a1b5571a2ee28c4cdfc5) )	/* red component */
 	ROM_LOAD( "bmk02.bin",    0x0100, 0x0100, CRC(af34d91a) SHA1(94bc6514c980fdd1cb013ff0819d6f32464c581c) )	/* green component */
 	ROM_LOAD( "bmk03.bin",    0x0200, 0x0100, CRC(43e9f6ef) SHA1(e1f58368fe0bd9b53f6c286ce5009b218a5197dc) )	/* blue component */

src/mame/drivers/1945kiii.c

@@ -264,21 +264,21 @@ MACHINE_DRIVER_END
 
 
 ROM_START( 1945kiii )
-	ROM_REGION( 0x100000, RGNCLASS_CPU, "main", 0 ) /* 68000 Code */
+	ROM_REGION( 0x100000, "main", 0 ) /* 68000 Code */
 	ROM_LOAD16_BYTE( "prg-1.u51", 0x00001, 0x80000, CRC(6b345f27) SHA1(60867fa0e2ea7ebdd4b8046315ee0c83e5cf0d74) )
 	ROM_LOAD16_BYTE( "prg-2.u52", 0x00000, 0x80000, CRC(ce09b98c) SHA1(a06bb712b9cf2249cc535de4055b14a21c68e0c5) )
 
-	ROM_REGION( 0x080000, RGNCLASS_SOUND, "oki1", 0 ) /* Samples */
+	ROM_REGION( 0x080000, "oki1", 0 ) /* Samples */
 	ROM_LOAD( "snd-2.su4", 0x00000, 0x80000, CRC(47e3952e) SHA1(d56524621a3f11981e4434e02f5fdb7e89fff0b4) )
 
-	ROM_REGION( 0x080000, RGNCLASS_SOUND, "oki2", 0 ) /* Samples */
+	ROM_REGION( 0x080000, "oki2", 0 ) /* Samples */
 	ROM_LOAD( "snd-1.su7", 0x00000, 0x80000, CRC(bbb7f0ff) SHA1(458cf3a0c2d42110bc2427db675226c6b8d30999) )
 
-	ROM_REGION( 0x400000, RGNCLASS_GFX, "gfx1", 0 ) // sprites
+	ROM_REGION( 0x400000, "gfx1", 0 ) // sprites
 	ROM_LOAD32_WORD( "m16m-1.u62", 0x000000, 0x200000, CRC(0b9a6474) SHA1(6110ecb17d0fef25935986af9a251fc6e88e3993) )
 	ROM_LOAD32_WORD( "m16m-2.u63", 0x000002, 0x200000, CRC(368a8c2e) SHA1(4b1f360c4a3a86d922035774b2c712be810ec548) )
 
-	ROM_REGION( 0x200000, RGNCLASS_GFX, "gfx2", 0 ) // bg tiles
+	ROM_REGION( 0x200000, "gfx2", 0 ) // bg tiles
 	ROM_LOAD( "m16m-3.u61", 0x00000, 0x200000, CRC(32fc80dd) SHA1(bee32493a250e9f21997114bba26b9535b1b636c) )
 ROM_END
 

src/mame/drivers/20pacgal.c

@@ -171,7 +171,7 @@ static WRITE8_HANDLER( rom_bank_select_w )
 
 	if (state->game_selected == 0)
 	{
-		UINT8 *rom = memory_region(machine, RGNCLASS_CPU, "main");
+		UINT8 *rom = memory_region(machine, "main");
 		memcpy(rom+0x48000, rom+0x8000, 0x2000);
 	}
 }
@@ -186,7 +186,7 @@ static WRITE8_HANDLER( rom_48000_w )
 		if (offset < 0x0800)
 			state->video_ram[offset & 0x07ff] = data;
 
-		memory_region(machine, RGNCLASS_CPU, "main")[0x48000 + offset] = data;
+		memory_region(machine, "main")[0x48000 + offset] = data;
 	}
 }
 
@@ -325,10 +325,10 @@ MACHINE_DRIVER_END
  *************************************/
 
 ROM_START( 20pacgal ) /* Version 1.01 */
-	ROM_REGION( 0x100000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x100000, "main", 0 )
 	ROM_LOAD( "20th_101.u13", 0x00000, 0x40000, CRC(77159582) SHA1(c05e005a941cbdc806dcd76b315069362c792a72) )
 
-	ROM_REGION( 0x8000, RGNCLASS_PROMS, "proms", 0 )	/* palette */
+	ROM_REGION( 0x8000, "proms", 0 )	/* palette */
 	ROM_LOAD( "20th_101.u14", 0x0000, 0x8000, CRC(c19d9ad0) SHA1(002581fbc2c32cdf7cfb0b0f64061591a462ec14) )
 ROM_END
 

src/mame/drivers/2mindril.c

@@ -218,27 +218,27 @@ MACHINE_DRIVER_END
 
 
 ROM_START( 2mindril )
-	ROM_REGION( 0x80000, RGNCLASS_CPU, "main", 0 ) /* 68000 Code */
+	ROM_REGION( 0x80000, "main", 0 ) /* 68000 Code */
 	ROM_LOAD16_BYTE( "d58-38.ic11", 0x00000, 0x40000, CRC(c58e8e4f) SHA1(648db679c3bfb5de1cd6c1b1217773a2fe56f11b) )
 	ROM_LOAD16_BYTE( "d58-37.ic9",  0x00001, 0x40000, CRC(19e5cc3c) SHA1(04ac0eef893c579fe90d91d7fd55c5741a2b7460) )
 
-	ROM_REGION( 0x200000, RGNCLASS_SOUND, "ym", 0 ) /* Samples */
+	ROM_REGION( 0x200000, "ym", 0 ) /* Samples */
 	ROM_LOAD( "d58-11.ic31", 0x000000, 0x200000,  CRC(dc26d58d) SHA1(cffb18667da18f5367b02af85a2f7674dd61ae97) )
 
-	ROM_REGION( 0x800000, RGNCLASS_GFX, "gfx1", ROMREGION_ERASE00 )
+	ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 )
 	ROM_LOAD32_WORD( "d58-09.ic28", 0x000000, 0x200000, CRC(d8f6a86a) SHA1(d6b2ec309e21064574ee63e025ae4716b1982a98) )
 	ROM_LOAD32_WORD( "d58-08.ic27", 0x000002, 0x200000, CRC(9f5a3f52) SHA1(7b696bd823819965b974c853cebc1660750db61e) )
 
-	ROM_REGION( 0x400000, RGNCLASS_GFX, "gfx2", 0 )
+	ROM_REGION( 0x400000, "gfx2", 0 )
 	ROM_LOAD32_WORD( "d58-10.ic29", 0x000000, 0x200000, CRC(74c87e08) SHA1(f39b3a64f8338ccf5ca6eb76cee92a10fe0aad8f) )
 ROM_END
 
 static DRIVER_INIT( drill )
 {
 	// rearrange gfx roms to something we can decode, two of the roms form 4bpp of the graphics, the third forms another 2bpp but is in a different format
-	UINT32 *src = (UINT32*)memory_region( machine, RGNCLASS_GFX, "gfx2" );
+	UINT32 *src = (UINT32*)memory_region( machine, "gfx2" );
-	UINT32 *dst = (UINT32*)memory_region( machine, RGNCLASS_GFX, "gfx1" );// + 0x400000;
+	UINT32 *dst = (UINT32*)memory_region( machine, "gfx1" );// + 0x400000;
-	UINT8 *rom = memory_region( machine, RGNCLASS_CPU, "main" );
+	UINT8 *rom = memory_region( machine, "main" );
 	int i;
 
 	for (i=0; i< 0x400000/4; i++)

src/mame/drivers/39in1.c

@@ -22,7 +22,7 @@
 
 static ADDRESS_MAP_START( 39in1_map, ADDRESS_SPACE_PROGRAM, 32 )
 	AM_RANGE(0x00000000, 0x0007ffff) AM_ROM
-	AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION(RGNCLASS_CPU, "main", 0)	// mirror to prevent crashing
+	AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("main", 0)	// mirror to prevent crashing
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( 39in1 )
@@ -50,11 +50,11 @@ MACHINE_DRIVER_END
 
 ROM_START( 39in1 )
 	// main program, appears to be encrypted
-	ROM_REGION( 0x80000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x80000, "main", 0 )
         ROM_LOAD( "27c4096_plz-v001_ver.300.bin", 0x000000, 0x080000, CRC(9149dbc4) SHA1(40efe1f654f11474f75ae7fee1613f435dbede38) )
 
 	// data ROM - contains a filesystem with ROMs, fonts, graphics, etc. in an unknown compressed format
-	ROM_REGION32_LE( 0x200000, RGNCLASS_USER, "user1", 0 )
+	ROM_REGION32_LE( 0x200000, "user1", 0 )
         ROM_LOAD( "16mflash.bin", 0x000000, 0x200000, CRC(a089f0f8) SHA1(e975eadd9176a8b9e416229589dfe3158cba22cb) )
 ROM_END
 

src/mame/drivers/40love.c

@@ -597,7 +597,7 @@ static READ8_HANDLER( undoukai_mcu_status_r )
 
 static DRIVER_INIT( undoukai )
 {
-	UINT8 *ROM = memory_region(machine, RGNCLASS_CPU, "main");
+	UINT8 *ROM = memory_region(machine, "main");
 	memory_configure_bank(1, 0, 2, &ROM[0x10000], 0x2000);
 
 	from_mcu = 0xff;
@@ -611,14 +611,14 @@ static DRIVER_INIT( undoukai )
 
 static DRIVER_INIT( 40love )
 {
-	UINT8 *ROM = memory_region(machine, RGNCLASS_CPU, "main");
+	UINT8 *ROM = memory_region(machine, "main");
 	memory_configure_bank(1, 0, 2, &ROM[0x10000], 0x2000);
 
 	#if 0
 		/* character ROM hack
             to show a white line on the opponent side */
 
-		UINT8 *ROM = memory_region(machine, RGNCLASS_GFX, "gfx2");
+		UINT8 *ROM = memory_region(machine, "gfx2");
 		int adr = 0x10 * 0x022b;
 		ROM[adr+0x000a] = 0x00;
 		ROM[adr+0x000b] = 0x00;
@@ -1134,7 +1134,7 @@ MACHINE_DRIVER_END
 /*******************************************************************************/
 
 ROM_START( 40love )
-	ROM_REGION( 0x14000, RGNCLASS_CPU, "main", 0 ) /* Z80 main CPU */
+	ROM_REGION( 0x14000, "main", 0 ) /* Z80 main CPU */
 	ROM_LOAD( "a30-19.ic1", 0x00000, 0x2000, CRC(7baca598) SHA1(b1767f5af9b3f484afb4423afe1f9c15db92c2ac) )
 	ROM_LOAD( "a30-20.ic2", 0x02000, 0x2000, CRC(a7b4f2cc) SHA1(67f570874fa0feb21f2a9a0712fadf78ebaad91c) )
 	ROM_LOAD( "a30-21.ic3", 0x04000, 0x2000, CRC(49a372e8) SHA1(7c15fac65369d2e90b432c0f5c8e1d7295c379d1) )
@@ -1142,7 +1142,7 @@ ROM_START( 40love )
 	ROM_LOAD( "a30-23.ic5", 0x10000, 0x2000, CRC(6dcd186e) SHA1(c8d88a2f35ba77ea822bdd8133033c8eb0bb5f72) )	/* banked at 0xa000 */
 	ROM_LOAD( "a30-24.ic6", 0x12000, 0x2000, CRC(590c20c8) SHA1(93689d6a299dfbe33ffec42d13378091d8589b34) )	/* banked at 0xa000 */
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* Z80 sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* Z80 sound CPU */
 	ROM_LOAD( "a30-08.u08", 0x0000, 0x2000, CRC(2fc42ee1) SHA1(b56e5f9acbcdc476252e188f41ad7249dba6f8e1) )
 	ROM_LOAD( "a30-09.u09", 0x2000, 0x2000, CRC(3a75abce) SHA1(ad2df26789d38196c0677c22ab8f176e99604b18) )
 	ROM_LOAD( "a30-10.u10", 0x4000, 0x2000, CRC(393c4b5b) SHA1(a8e1dd5c33e929bc832cccc13b85ecd13fff1eb2) )
@@ -1150,22 +1150,22 @@ ROM_START( 40love )
 	ROM_LOAD( "a30-12.u38", 0x8000, 0x2000, CRC(f7afd475) SHA1(dd09d5ca7fec5e0454f9efb8ebc722561010f124) )
 	ROM_LOAD( "a30-13.u39", 0xa000, 0x2000, CRC(e806630f) SHA1(09022aae88ea0171a0aacf3260fa3a95e8faeb21) )
 
-	ROM_REGION( 0x0800, RGNCLASS_CPU, "mcu", 0 )	/* 2k for the microcontroller */
+	ROM_REGION( 0x0800, "mcu", 0 )	/* 2k for the microcontroller */
 	ROM_LOAD( "a30-14"    , 0x0000, 0x0800, CRC(c4690279) SHA1(60bc77e03b9be434bb97a374a2fedeb8d049a660) )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "a30-25.u22", 0x0000, 0x2000, CRC(15e594cf) SHA1(d2d506a55f6ac2c191e5d5b3127021cde366c71c) )
 	ROM_LOAD( "415f.26", 0x2000, 0x2000, BAD_DUMP CRC(3a45a205) SHA1(0939ecaabbb9be2a0719ef252e3f244299734ba6)  )	/* this actually seems good, but we need to find another one to verify */
 	ROM_LOAD( "a30-27.u24", 0x4000, 0x2000, CRC(57c67f6f) SHA1(293e5bfa7c859886abd70f78fe2e4b13a3fce3f5) )
 	ROM_LOAD( "a30-28.u25", 0x6000, 0x2000, CRC(d581d067) SHA1(ce132cf2503917f0846b838c6ce4ad4183181bf9) )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "a30-29.u62", 0x0000, 0x2000, CRC(02deaf40) SHA1(fb424a40bd9d959664a6d1ddf477fc16e694b9fa) )
 	ROM_LOAD( "a30-30.u63", 0x2000, 0x2000, CRC(439f3731) SHA1(4661149baa8472989cc8ac85c51e55df69957d99) )
 	ROM_LOAD( "a30-31.u64", 0x4000, 0x2000, CRC(7ed70e81) SHA1(f90a3ce701ebe746803cf01ea1f6725c552007de) )
 	ROM_LOAD( "a30-32.u65", 0x6000, 0x2000, CRC(0434655b) SHA1(261c5e60e830967564c053dc1d40fbf1e7194fc8) )
 
-	ROM_REGION( 0x1000, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x1000, "proms", 0 )
 	ROM_LOAD( "a30-15.u03", 0x0000, 0x0400, CRC(55e38cc7) SHA1(823a6d7f29eadf5d12702d782d4297b0d4c65a0e) )	/* red */
 	ROM_LOAD( "a30-16.u01", 0x0400, 0x0400, CRC(13997e20) SHA1(9fae1cf633409a88263dc66a17b1c2eeccd05f4f) )	/* green */
 	ROM_LOAD( "a30-17.u02", 0x0800, 0x0400, CRC(5031f2f3) SHA1(1836d82fdc9f39cb318a791af2a935c27baabfd7) )	/* blue */
@@ -1174,16 +1174,16 @@ ROM_START( 40love )
 ROM_END
 
 ROM_START( fieldday )
-	ROM_REGION( 0x14000, RGNCLASS_CPU, "main", 0 ) /* Z80 main CPU  */
+	ROM_REGION( 0x14000, "main", 0 ) /* Z80 main CPU  */
 	ROM_LOAD( "a17_44.bin", 0x00000, 0x2000, CRC(d59812e1) SHA1(f3e7e2f09fba5964c92813cd652aa093fe3e4415) )
 	ROM_LOAD( "a17_45.bin", 0x02000, 0x2000, CRC(828bfb9a) SHA1(0be24ec076b715d65e9c8e01e3be76628e4f60ed) )
 	ROM_LOAD( "a23_05.bin", 0x04000, 0x2000, CRC(2670cad3) SHA1(8ba3a6b788fa4e997f9153226f6f13b32fc33124) )
 	ROM_LOAD( "a23_06.bin", 0x06000, 0x2000, CRC(737ce7de) SHA1(52a46fe14978e217de81dcd529d16d62fb5a4e46) )
 	ROM_LOAD( "a23_07.bin", 0x10000, 0x2000, CRC(ee2fb306) SHA1(f2b0a6af279b459fe61d56ba4d36d519318376fb) )
 	ROM_LOAD( "a23_08.bin", 0x12000, 0x2000, CRC(1ed2f1ad) SHA1(e3cf954dd2c34759147d0c85da7a716a8eb0e820) )
-	ROM_COPY( RGNCLASS_CPU, "main" , 0x10000, 0x8000, 0x2000 ) /* to avoid 'bank bug' */
+	ROM_COPY( "main" , 0x10000, 0x8000, 0x2000 ) /* to avoid 'bank bug' */
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* Z80 sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* Z80 sound CPU */
 	ROM_LOAD( "a17_24.bin", 0x0000, 0x2000, CRC(6bac6b7f) SHA1(eb95192204a868737d609b789312ac37c31d3071) )
 	ROM_LOAD( "a17_25.bin", 0x2000, 0x2000, CRC(570b90b1) SHA1(2a8c3bebd15655ffbfeaf40c2db90292afbb11ef) )
 	ROM_LOAD( "a17_26.bin", 0x4000, 0x2000, CRC(7a8ea7f4) SHA1(1d9d2b54645266f95aa89cdbec6f82d4ac20d6e4) )
@@ -1191,23 +1191,23 @@ ROM_START( fieldday )
 	ROM_LOAD( "a17_28.bin", 0x8000, 0x2000, CRC(1a4d1dae) SHA1(fbc3c55ad9f15ead432c136eec648fe22e523ea7) )
 	ROM_LOAD( "a17_29.bin", 0xa000, 0x2000, CRC(3c540007) SHA1(549e7ff260214c538913ff548dcb088987845911) )
 
-	ROM_REGION( 0x0800, RGNCLASS_CPU, "cpu2", 0 )	/* 2k for the microcontroller */
+	ROM_REGION( 0x0800, "cpu2", 0 )	/* 2k for the microcontroller */
 	ROM_LOAD( "a17_14.bin", 0x0000, 0x0800, NO_DUMP )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "a17_36.bin", 0x0000, 0x2000, CRC(e3dd51f7) SHA1(95a97ea925c5bc7bdc00887e6d17d817b36befc4) )
 	ROM_LOAD( "a17_37.bin", 0x2000, 0x2000, CRC(1623f71f) SHA1(f5df7498b9a08e82ea11cb1b1fcdabca48cbf33a) )
 	ROM_LOAD( "a17_38.bin", 0x4000, 0x2000, CRC(ca9f74db) SHA1(a002f1dfa9497793bfb18292e7a71ae12d70fb88) )
 	ROM_LOAD( "a17_39.bin", 0x6000, 0x2000, CRC(fb6c667c) SHA1(da56be8d997db199588ee22fae30cc6d87e80704) )
 
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "a23_09.bin", 0x0000, 0x2000, CRC(1e430be5) SHA1(9296e1a0d820bb218578d55b739b4fc5fdafb125) )
 	ROM_LOAD( "a23_10.bin", 0x2000, 0x2000, CRC(ee2e54f0) SHA1(0a92fa39696a8005f9441131b6d98205b7c26e7b) )
 	ROM_LOAD( "a23_11.bin", 0x4000, 0x2000, CRC(6d37f15c) SHA1(3eb9a2e230d88f2871e6972a01d8e7cc7db1b123) )
 	ROM_LOAD( "a23_12.bin", 0x6000, 0x2000, CRC(86da42d2) SHA1(aa79cd954c96217ca2daf37addac168f8cca24f9) )
 
-	ROM_REGION( 0x1000, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x1000, "proms", 0 )
 	ROM_LOAD( "a17-15.10v", 0x0000, 0x0400, CRC(9df472b7) SHA1(0cd9dd735238daf8e8228ba9481df57fb8925328) )	/* red */
 	ROM_LOAD( "a17-16.8v",  0x0400, 0x0400, CRC(3bf1ff5f) SHA1(a0453851aefa9acdba4a86aaca8c442cb8550987) )	/* green */
 	ROM_LOAD( "a17-17.9v",  0x0800, 0x0400, CRC(c42ae956) SHA1(057ce3783305c98622f7dfc0ee7d4882137a2ef8) )	/* blue */
@@ -1215,13 +1215,13 @@ ROM_START( fieldday )
 ROM_END
 
 ROM_START( undoukai )
-	ROM_REGION( 0x14000, RGNCLASS_CPU, "main", 0 ) /* Z80 main CPU  */
+	ROM_REGION( 0x14000, "main", 0 ) /* Z80 main CPU  */
 	ROM_LOAD( "a17-01.70c", 0x00000, 0x4000, CRC(6ce324d9) SHA1(9c5207ac897eaae5a6aa1a05a918c9cb58544664) )
 	ROM_LOAD( "a17-02.71c", 0x04000, 0x4000, CRC(055c7ef1) SHA1(f974bd441b8e3621ac5f8d36104791c97051a97a) )
 	ROM_LOAD( "a17-03.72c", 0x10000, 0x4000, CRC(9034a5c5) SHA1(bc3dae0dee08b6989275ac220fc76bfe61367154) ) /* banked at 0x8000 */
-	ROM_COPY( RGNCLASS_CPU, "main" , 0x10000, 0x8000, 0x2000 ) /* to avoid 'bank bug' */
+	ROM_COPY( "main" , 0x10000, 0x8000, 0x2000 ) /* to avoid 'bank bug' */
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* Z80 sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* Z80 sound CPU */
 	ROM_LOAD( "a17-08.8s",  0x0000, 0x2000, CRC(2545aa0e) SHA1(190ef99890251e1e49b14ffd28f2badb4d0d8fbe) )
 	ROM_LOAD( "a17-09.9s",  0x2000, 0x2000, CRC(57e2cdbb) SHA1(ae6187d62fb36a37be06040e0fd85e0252cdf750) )
 	ROM_LOAD( "a17-10.10s", 0x4000, 0x2000, CRC(38a288fe) SHA1(af4979cae59ca2569a3663132451b9b554552a79) )
@@ -1229,18 +1229,18 @@ ROM_START( undoukai )
 	ROM_LOAD( "a17-12.38s", 0x8000, 0x2000, CRC(cb7e6dcd) SHA1(5286c6d340c1d465caebae5dd7e3d4ff8b7f8f5e) )
 	ROM_LOAD( "a17-13.39s", 0xa000, 0x2000, CRC(0a40930e) SHA1(8c4b9fa0aed67a3e269c2136ef81791fc8acd1da) )
 
-	ROM_REGION( 0x0800, RGNCLASS_CPU, "cpu2", 0 )	/* 2k for the microcontroller */
+	ROM_REGION( 0x0800, "cpu2", 0 )	/* 2k for the microcontroller */
 	ROM_LOAD( "a17-14.41c", 0x0000, 0x0800, NO_DUMP )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "a17-04.18v", 0x0000, 0x4000, CRC(84dabee2) SHA1(698f12ee4201665988248853dafbf4b16dfc6517) )
 	ROM_LOAD( "a17-05.19v", 0x4000, 0x4000, CRC(10bf3451) SHA1(23ebb1409c90d225ff5a13ad23d4dff1acaf904a) )
 
-	ROM_REGION( 0x8000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x8000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "a17-06.59v", 0x0000, 0x4000, CRC(50f28ad9) SHA1(001555ad123ac85000999b1aa39c1b2568e26f46) )
 	ROM_LOAD( "a17-07.60v", 0x4000, 0x4000, CRC(7a4b4238) SHA1(8e58803645e61a7144a659d403f318a8899d36e2) )
 
-	ROM_REGION( 0x1000, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x1000, "proms", 0 )
 	ROM_LOAD( "a17-15.10v", 0x0000, 0x0400, CRC(9df472b7) SHA1(0cd9dd735238daf8e8228ba9481df57fb8925328) )	/* red */
 	ROM_LOAD( "a17-16.8v",  0x0400, 0x0400, CRC(3bf1ff5f) SHA1(a0453851aefa9acdba4a86aaca8c442cb8550987) )	/* green */
 	ROM_LOAD( "a17-17.9v",  0x0800, 0x0400, CRC(c42ae956) SHA1(057ce3783305c98622f7dfc0ee7d4882137a2ef8) )	/* blue */

src/mame/drivers/4enraya.c

@@ -190,16 +190,16 @@ MACHINE_DRIVER_END
 ***************************************************************************/
 
 ROM_START( 4enraya )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "5.bin",   0x0000, 0x8000, CRC(cf1cd151) SHA1(3920b0a6ed5798859158871b578b01ec742b0d13) )
 	ROM_LOAD( "4.bin",   0x8000, 0x4000, CRC(f9ec1be7) SHA1(189159129ecbc4f6909c086867b0e02821f5b976) )
 
-	ROM_REGION( 0x6000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x6000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "1.bin",   0x0000, 0x2000, CRC(87f92552) SHA1(d16afd963c30f2e60951876b843e5c1dcbee1cfc) )
 	ROM_LOAD( "2.bin",   0x2000, 0x2000, CRC(2b0a3793) SHA1(2c3d224251557824bb9641dc2f98a000ab72c4a2) )
 	ROM_LOAD( "3.bin",   0x4000, 0x2000, CRC(f6940836) SHA1(afde21ffa0c141cf73243e50da62ecfd474aaac2) )
 
-	ROM_REGION( 0x0020,  RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0020,  "proms", 0 )
 	ROM_LOAD( "1.bpr",   0x0000, 0x0020, CRC(dcbd2352) SHA1(ce72e84129ed1b455aaf648e1dfaa4333e7e7628) )	/* not used */
 ROM_END
 

src/mame/drivers/8080bw.c

@@ -1643,7 +1643,7 @@ MACHINE_DRIVER_END
 
 
 ROM_START( searthin )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "earthinv.h",   0x0000, 0x0800, CRC(58a750c8) SHA1(90bfa4ea06f38e67fe4286d37d151632439249d2) )
 	ROM_LOAD( "earthinv.g",   0x0800, 0x0800, CRC(b91742f1) SHA1(8d9ca92405fbaf1d5a7138d400986616378d061e) )
 	ROM_LOAD( "earthinv.f",   0x1000, 0x0800, CRC(4acbbc60) SHA1(b8c1efb4251a1e690ff6936ec956d6f66136a085) )
@@ -1651,7 +1651,7 @@ ROM_START( searthin )
 ROM_END
 
 ROM_START( searthia )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "unkh.h1",   0x0000, 0x0400, CRC(272b9bf3) SHA1(dd57d6a88d42024a39640931114107b547b4c520) )
 	ROM_LOAD( "unkg.g1",   0x0400, 0x0400, CRC(61bb6101) SHA1(8fc8bbd8ac93d239e0cf0e4881f709860ec2c973) )
 	ROM_LOAD( "unkf.f1",   0x0800, 0x0400, CRC(2a8d9cd5) SHA1(7948d79b326e729bcb629607c8797156ff9fb0e8) )
@@ -1664,7 +1664,7 @@ ROM_END
 
 
 ROM_START( invadrmr )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	/* yes, this rom is really on the PCB twice?! */
 	ROM_LOAD( "11.1s",       0x0000, 0x0400, CRC(389d44b6) SHA1(5d2581b8bc0da918ce57cf319e06b5b31989c681) )
 	ROM_LOAD( "11.1t",       0x0000, 0x0400, CRC(389d44b6) SHA1(5d2581b8bc0da918ce57cf319e06b5b31989c681) )
@@ -1677,7 +1677,7 @@ ROM_START( invadrmr )
 ROM_END
 
 ROM_START( spaceatt )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "h",            0x0000, 0x0400, CRC(d0c32d72) SHA1(b3bd950b1ba940fbeb5d95e55113ed8f4c311434) )
 	ROM_LOAD( "sv02.bin",     0x0400, 0x0400, CRC(0e159534) SHA1(94b2015a9d38ca738705b8d024a79fd2f9855b98) )
 	ROM_LOAD( "f",            0x0800, 0x0400, CRC(483e651e) SHA1(ae795ee3bc53ac3936f6cf2c72cca7a890783513) )
@@ -1687,7 +1687,7 @@ ROM_START( spaceatt )
 ROM_END
 
 ROM_START( spaceat2 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "spaceatt.h",   0x0000, 0x0800, CRC(a31d0756) SHA1(2b76929654ed0b180091348546dac29fc6e5438e) )
 	ROM_LOAD( "spaceatt.g",   0x0800, 0x0800, CRC(f41241f7) SHA1(d93cead75922510075433849c4f7099279eafc18) )
 	ROM_LOAD( "spaceatt.f",   0x1000, 0x0800, CRC(4c060223) SHA1(957e75a978aa600627399061cae0a6525e92ad11) )
@@ -1695,7 +1695,7 @@ ROM_START( spaceat2 )
 ROM_END
 
 ROM_START( sinvzen )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "1.bin",        0x0000, 0x0400, CRC(9b0da779) SHA1(a52ccdb252eb69c497aa5eafb35d7f25a311b44e) )
 	ROM_LOAD( "2.bin",        0x0400, 0x0400, CRC(9858ccab) SHA1(5ad8e5ef0d95779f0e513634b97bc330c9269ce4) )
 	ROM_LOAD( "3.bin",        0x0800, 0x0400, CRC(a1cc38b5) SHA1(45fc9466b548d511b8174f6f3a4783164dd59489) )
@@ -1707,7 +1707,7 @@ ROM_START( sinvzen )
 ROM_END
 
 ROM_START( sinvemag )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "sv0h.bin",     0x0000, 0x0400, CRC(86bb8cb6) SHA1(a75648e7f2446c756d86624b15d387d25ce47b66) )
 	ROM_LOAD( "emag_si.b",    0x0400, 0x0400, CRC(febe6d1a) SHA1(e1c3a24b4fa5862107ada1f9d7249466e8c3f06a) )
 	ROM_LOAD( "emag_si.c",    0x0800, 0x0400, CRC(aafb24f7) SHA1(6718cdfae09f77d735be5145b9d202a73d8ed9db) )
@@ -1717,7 +1717,7 @@ ROM_START( sinvemag )
 ROM_END
 
 ROM_START( tst_invd )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "test.h",   0x0000, 0x0800, CRC(f86a2eea) SHA1(4a72ff01f3e6d16bbe9bf7f123cd98895bfbed9a) )   /*  The Test ROM */
 	ROM_LOAD( "invaders.g",   0x0800, 0x0800, CRC(6bfaca4a) SHA1(16f48649b531bdef8c2d1446c429b5f414524350) )
 	ROM_LOAD( "invaders.f",   0x1000, 0x0800, CRC(0ccead96) SHA1(537aef03468f63c5b9e11dd61e253f7ae17d9743) )
@@ -1725,7 +1725,7 @@ ROM_START( tst_invd )
 ROM_END
 
 ROM_START( alieninv )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "1h.bin",       0x0000, 0x0800, CRC(c46df7f4) SHA1(eec34b3d5585bae03c7b80585daaa05ddfcc2164) )
 	ROM_LOAD( "1g.bin",       0x0800, 0x0800, CRC(4b1112d6) SHA1(b693667656e5d8f44eeb2ea730f4d4db436da579) )
 	ROM_LOAD( "1f.bin",       0x1000, 0x0800, CRC(adca18a5) SHA1(7e02651692113db31fd469868ae5ffdb0f941ecf) )
@@ -1733,7 +1733,7 @@ ROM_START( alieninv )
 ROM_END
 
 ROM_START( sitv )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "tv0h.s1",      0x0000, 0x0800, CRC(fef18aad) SHA1(043edeefe6a6d4934bd384eafea19326de1dbeec) )
 	ROM_LOAD( "tv02.rp1",     0x0800, 0x0800, CRC(3c759a90) SHA1(d847d592dee592b1d3a575c21d89eaf3f7f6ae1b) )
 	ROM_LOAD( "tv03.n1",      0x1000, 0x0800, CRC(0ad3657f) SHA1(a501f316535c50f7d7a20ef8e6dede1526a3f2a8) )
@@ -1741,32 +1741,32 @@ ROM_START( sitv )
 ROM_END
 
 ROM_START( sicv )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "cv17.bin",     0x0000, 0x0800, CRC(3dfbe9e6) SHA1(26487df7fa0bbd0b9b7f74347c4b9318b0a73b89) )
 	ROM_LOAD( "cv18.bin",     0x0800, 0x0800, CRC(bc3c82bf) SHA1(33e39fc97bd46699be1f9b9741a86f433efdc911) )
 	ROM_LOAD( "cv19.bin",     0x1000, 0x0800, CRC(d202b41c) SHA1(868fe938ef768655c894ec95b7d9a81bf21f69ca) )
 	ROM_LOAD( "cv20.bin",     0x1800, 0x0800, CRC(c74ee7b6) SHA1(4f52db274a2d4433ab67c099ee805e8eb8516c0f) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 */
 	ROM_LOAD( "cv01_1.bin",   0x0000, 0x0400, CRC(aac24f34) SHA1(ad110e776547fb48baac568bb50d61854537ca34) )
 	ROM_LOAD( "cv02_2.bin",   0x0400, 0x0400, CRC(2bdf83a0) SHA1(01ffbd43964c41987e7d44816271308f9a70802b) )
 ROM_END
 
 ROM_START( sisv )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "sv0h.bin",     0x0000, 0x0400, CRC(86bb8cb6) SHA1(a75648e7f2446c756d86624b15d387d25ce47b66) )
 	ROM_LOAD( "sv02.bin",     0x0400, 0x0400, CRC(0e159534) SHA1(94b2015a9d38ca738705b8d024a79fd2f9855b98) )
 	ROM_LOAD( "invaders.g",   0x0800, 0x0800, CRC(6bfaca4a) SHA1(16f48649b531bdef8c2d1446c429b5f414524350) )
 	ROM_LOAD( "invaders.f",   0x1000, 0x0800, CRC(0ccead96) SHA1(537aef03468f63c5b9e11dd61e253f7ae17d9743) )
 	ROM_LOAD( "tv04.m1",      0x1800, 0x0800, CRC(cd2c67f6) SHA1(60f9d8fe2d36ff589277b607f07c1edc917c755c) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 */
 	ROM_LOAD( "cv01_1.bin",   0x0000, 0x0400, CRC(aac24f34) SHA1(ad110e776547fb48baac568bb50d61854537ca34) )
 	ROM_LOAD( "cv02_2.bin",   0x0400, 0x0400, CRC(2bdf83a0) SHA1(01ffbd43964c41987e7d44816271308f9a70802b) )
 ROM_END
 
 ROM_START( sisv2 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "sv0h.bin",     0x0000, 0x0400, CRC(86bb8cb6) SHA1(a75648e7f2446c756d86624b15d387d25ce47b66) )
 	ROM_LOAD( "emag_si.b",    0x0400, 0x0400, CRC(febe6d1a) SHA1(e1c3a24b4fa5862107ada1f9d7249466e8c3f06a) )
 	ROM_LOAD( "sv12",         0x0800, 0x0400, CRC(a08e7202) SHA1(de9f7c851d1b894915e720cfc5d794cdb31752f6) )
@@ -1774,13 +1774,13 @@ ROM_START( sisv2 )
 	ROM_LOAD( "sv13",         0x1800, 0x0400, CRC(a9011634) SHA1(1f1369ecb02078042cfdf17a497b8dda6dd23793) )
 	ROM_LOAD( "sv14",         0x1c00, 0x0400, CRC(58730370) SHA1(13dc806bcecd2d6089a85dd710ac2869413f7475) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 */
 	ROM_LOAD( "cv01_1.bin",   0x0000, 0x0400, CRC(aac24f34) SHA1(ad110e776547fb48baac568bb50d61854537ca34) )
 	ROM_LOAD( "cv02_2.bin",   0x0400, 0x0400, CRC(2bdf83a0) SHA1(01ffbd43964c41987e7d44816271308f9a70802b) )
 ROM_END
 
 ROM_START( spceking )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "invaders.h",   0x0000, 0x0800, CRC(734f5ad8) SHA1(ff6200af4c9110d8181249cbcef1a8a40fa40b7f) )
 	ROM_LOAD( "spcekng2",     0x0800, 0x0800, CRC(96dcdd42) SHA1(e18d7ffca92e863ef40e235b2be973d8c5879fdb) )
 	ROM_LOAD( "spcekng3",     0x1000, 0x0800, CRC(95fc96ad) SHA1(38175edad0e538a1561cec8f7613f15ae274dd14) )
@@ -1788,7 +1788,7 @@ ROM_START( spceking )
 ROM_END
 
 ROM_START( spcewars )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "sanritsu.1",   0x0000, 0x0400, CRC(ca331679) SHA1(5c362c3d1c721d293bcddbef4033533769c8f0e0) )
 	ROM_LOAD( "sanritsu.2",   0x0400, 0x0400, CRC(48dc791c) SHA1(91a98205c83ca38961e6ba2ac43a41e6e8bc2675) )
 	ROM_LOAD( "ic35.bin",     0x0800, 0x0800, CRC(40c2d55b) SHA1(b641b63046d242ad23911143ed840011fc98eaff) )
@@ -1800,7 +1800,7 @@ ROM_START( spcewars )
 ROM_END
 
 ROM_START( spacewr3 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "ic36.bin",     0x0000, 0x0800, CRC(9e30f88a) SHA1(314dfb2920d9b43b977cc19e40ac315e6933c3b9) )
 	ROM_LOAD( "ic35.bin",     0x0800, 0x0800, CRC(40c2d55b) SHA1(b641b63046d242ad23911143ed840011fc98eaff) )
 	ROM_LOAD( "ic34.bin",     0x1000, 0x0800, CRC(b435f021) SHA1(2d0d813b99d571b53770fa878a1f82ca67827caa) )
@@ -1809,7 +1809,7 @@ ROM_START( spacewr3 )
 ROM_END
 
 ROM_START( invaderl )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "c01",          0x0000, 0x0400, CRC(499f253a) SHA1(e13353194277f5d35e92db9b11912b5f392f51b7) )
 	ROM_LOAD( "c02",          0x0400, 0x0400, CRC(2d0b2e1f) SHA1(2e0262d9dba607824fcd720d2995531649bdd03d) )
 	ROM_LOAD( "c03",          0x0800, 0x0400, CRC(03033dc2) SHA1(87d7838e6a6542c2c5510af593df45137cb397c6) )
@@ -1820,7 +1820,7 @@ ROM_START( invaderl )
 ROM_END
 
 ROM_START( invader4 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "spin4.a",      0x0000, 0x0800, CRC(bb386dfe) SHA1(cc00f3e4f6ca4c05bae038a24ccdb213fb951cfc) )
 	ROM_LOAD( "spin4.b",      0x0800, 0x0800, CRC(63afa11d) SHA1(d8cedfa010a49237e31f6ebaed35134cb1c3ce68) )
 	ROM_LOAD( "spin4.c",      0x1000, 0x0800, CRC(22b0317c) SHA1(8fd037bf5f89a7bcb06042697410566d5180912a) )
@@ -1828,32 +1828,32 @@ ROM_START( invader4 )
 ROM_END
 
 ROM_START( jspecter )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "3305.u6",      0x0000, 0x1000, CRC(ab211a4f) SHA1(d675ed29c3479d7318f8559bd56dd619cf631b6a) )
 	ROM_LOAD( "3306.u7",      0x1400, 0x1000, CRC(0df142a7) SHA1(2f1c32d6fe7eafb7808fef0bdeb69b4909427417) )
 ROM_END
 
 ROM_START( jspectr2 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "unksi.b2",     0x0000, 0x1000, CRC(0584b6c4) SHA1(c130021b878bde2beda4a189f71bbfed61088535) )
 	ROM_LOAD( "unksi.a2",     0x1400, 0x1000, CRC(58095955) SHA1(545df3bb9ee4ff09f491d7a4b704e31aa311a8d7) )
 ROM_END
 
 ROM_START( invadpt2 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "pv01",        0x0000, 0x0800, CRC(7288a511) SHA1(ff617872784c28ed03591aefa9f0519e5651701f) )
 	ROM_LOAD( "pv02",        0x0800, 0x0800, CRC(097dd8d5) SHA1(8d68654d54d075c0f0d7f63c87ff4551ce8b7fbf) )
 	ROM_LOAD( "pv03",        0x1000, 0x0800, CRC(1766337e) SHA1(ea959bf06c9930d83a07559e191a28641efb07ac) )
 	ROM_LOAD( "pv04",        0x1800, 0x0800, CRC(8f0e62e0) SHA1(a967b155f15f8432222fcc78b23121b00c405c5c) )
 	ROM_LOAD( "pv05",        0x4000, 0x0800, CRC(19b505e9) SHA1(6a31a37586782ce421a7d2cffd8f958c00b7b415) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 */
 	ROM_LOAD( "pv06.1",   0x0000, 0x0400, CRC(a732810b) SHA1(a5fabffa73ca740909e23b9530936f9274dff356) )
 	ROM_LOAD( "pv07.2",   0x0400, 0x0400, CRC(2c5b91cb) SHA1(7fa4d4aef85473b1b4f18734230c164e72be44e7) )
 ROM_END
 
 ROM_START( invaddlx )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "invdelux.h",   0x0000, 0x0800, CRC(e690818f) SHA1(0860fb03a64d34a9704a1459a5e96929eafd39c7) )
 	ROM_LOAD( "invdelux.g",   0x0800, 0x0800, CRC(4268c12d) SHA1(df02419f01cf0874afd1f1aa16276751acd0604a) )
 	ROM_LOAD( "invdelux.f",   0x1000, 0x0800, CRC(f4aa1880) SHA1(995d77b67cb4f2f3781c2c8747cb058b7c1b3412) )
@@ -1862,7 +1862,7 @@ ROM_START( invaddlx )
 ROM_END
 
 ROM_START( moonbase )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "ze3-1.bin",    0x0000, 0x0400, CRC(82dbf2c7) SHA1(c767d8b866db4a5059bd79f962a90ce3a962e1e6) )
 	ROM_LOAD( "ze3-2.bin",    0x0400, 0x0400, CRC(c867f5b4) SHA1(686318fda6edde297aecaf33f480bfa075fa6eca) )
 	ROM_LOAD( "ze3-3.bin",    0x0800, 0x0400, CRC(cb23ccc1) SHA1(86be2d14d52b3404e1a25c573bd25b97729d82a1) )
@@ -1874,13 +1874,13 @@ ROM_START( moonbase )
 	ROM_LOAD( "ze3-9.bin",    0x4000, 0x0400, CRC(2dd5adfa) SHA1(62cb98cad1e48de0e0cbf30392d35834b38dadbd) )
 	ROM_LOAD( "ze3-10.bin",   0x4400, 0x0400, CRC(1e7c22a4) SHA1(b34173375494ffbf5400dd4014a683a9807f4f08) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 */
 	ROM_LOAD( "n02prm.6a",    0x0000, 0x0400, CRC(2bdf83a0) SHA1(01ffbd43964c41987e7d44816271308f9a70802b) )
 	ROM_LOAD( "n01prm.6b",    0x0400, 0x0400, CRC(aac24f34) SHA1(ad110e776547fb48baac568bb50d61854537ca34) )
 ROM_END
 
 ROM_START( invrvnge )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "invrvnge.h",   0x0000, 0x0800, CRC(aca41bbb) SHA1(ca71f792abd6d9a44d15b19d2ccf678e82ccba4f) )
 	ROM_LOAD( "invrvnge.g",   0x0800, 0x0800, CRC(cfe89dad) SHA1(218b6a0b636c49c4cdc3667e8b1387ef0e257115) )
 	ROM_LOAD( "invrvnge.f",   0x1000, 0x0800, CRC(e350de2c) SHA1(e845565e2f96f9dec3242ec5ab75910a515428c9) )
@@ -1888,7 +1888,7 @@ ROM_START( invrvnge )
 ROM_END
 
 ROM_START( invrvnga )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "5m.bin",       0x0000, 0x0800, CRC(b145cb71) SHA1(127eb11de7ab9835f06510fb12838c0b728c0d42) )
 	ROM_LOAD( "5n.bin",       0x0800, 0x0800, CRC(660e8af3) SHA1(bd52eadf4ee3d717fd5bd7206e1e87d729250c92) )
 	ROM_LOAD( "5p.bin",       0x1000, 0x0800, CRC(6ec5a9ad) SHA1(d1e84d2d60c6128c092f2cd20a2b87216df3034b) )
@@ -1896,7 +1896,7 @@ ROM_START( invrvnga )
 ROM_END
 
 ROM_START( spclaser )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "la01",         0x0000, 0x0800, CRC(bedc0078) SHA1(a5bb0cbbb8e3f27d03beb8101b2be1111d73689d) )
 	ROM_LOAD( "spcewarl.2",   0x0800, 0x0800, CRC(43bc65c5) SHA1(5f9827c02c2d221e1607359c840374ff7fb92fbf) )
 	ROM_LOAD( "la03",         0x1000, 0x0800, CRC(1083e9cc) SHA1(7ad45c6230c9e02fcf51e3414c15e2237eebbd7a) )
@@ -1904,7 +1904,7 @@ ROM_START( spclaser )
 ROM_END
 
 ROM_START( laser )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "1.u36",        0x0000, 0x0800, CRC(b44e2c41) SHA1(00e0b2e088495d6f3bc175e8a53dcb3686ea8484) )
 	ROM_LOAD( "2.u35",        0x0800, 0x0800, CRC(9876f331) SHA1(14e36b26d186d9a195492834ef989ed5664d7b65) )
 	ROM_LOAD( "3.u34",        0x1000, 0x0800, CRC(ed79000b) SHA1(bfe0407e833ce61aa909f5f1f93c3fc1d46605e9) )
@@ -1912,7 +1912,7 @@ ROM_START( laser )
 ROM_END
 
 ROM_START( spcewarl )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "spcewarl.1",   0x0000, 0x0800, CRC(1fcd34d2) SHA1(674139944e0d842a85bd21b326bd735e15453038) )
 	ROM_LOAD( "spcewarl.2",   0x0800, 0x0800, CRC(43bc65c5) SHA1(5f9827c02c2d221e1607359c840374ff7fb92fbf) )
 	ROM_LOAD( "spcewarl.3",   0x1000, 0x0800, CRC(7820df3a) SHA1(53315857f4282c68624b338b068d80ee6828af4c) )
@@ -1920,7 +1920,7 @@ ROM_START( spcewarl )
 ROM_END
 
 ROM_START( galxwars )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "univgw3.0",    0x0000, 0x0400, CRC(937796f4) SHA1(88e9494cc532498e51e3a68fa1122c40f22b27dd) )
 	ROM_LOAD( "univgw4.1",    0x0400, 0x0400, CRC(4b86e7a6) SHA1(167f9f7491a2de39d08e3e6f7057cc75b36c9340) )
 	ROM_LOAD( "univgw5.2",    0x0800, 0x0400, CRC(47a187cd) SHA1(640c896ba25f34d323624005bd676257ad17b687) )
@@ -1930,13 +1930,13 @@ ROM_START( galxwars )
 ROM_END
 
 ROM_START( galxwar2 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "3192.h6",      0x0000, 0x1000, CRC(bde6860b) SHA1(e04b8add32d8f7ea588fae6d6a387f1d40495f1b) )
 	ROM_LOAD( "3193.h7",      0x4000, 0x1000, CRC(a17cd507) SHA1(554ab0e8bdc0e7af4a30b0ddc8aa053c8e70255c) ) /* 2nd half unused */
 ROM_END
 
 ROM_START( galxwart )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "galxwars.0",   0x0000, 0x0400, CRC(608bfe7f) SHA1(a41a40a2f0a1bb61a70b9ff8a7da925ab1db7f74) )
 	ROM_LOAD( "galxwars.1",   0x0400, 0x0400, CRC(a810b258) SHA1(030a72fffcf240f643bc3006028cb4883cf58bbc) )
 	ROM_LOAD( "galxwars.2",   0x0800, 0x0400, CRC(74f31781) SHA1(1de70e8ebbb26eea20ffedb7bd0ca051a67f45e7) )
@@ -1946,7 +1946,7 @@ ROM_START( galxwart )
 ROM_END
 
 ROM_START( starw )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "roma",         0x0000, 0x0400, CRC(60e8993c) SHA1(0bdf163ff0f2e6a8771987d4e7ac604c45af21b8) )
 	ROM_LOAD( "romb",         0x0400, 0x0400, CRC(b8060773) SHA1(92aa358c338ef8f5773bccada8988d068764e7ea) )
 	ROM_LOAD( "romc",         0x0800, 0x0400, CRC(307ce6b8) SHA1(f4b6f54db3d2377ec27d62d33fa1c4946559a092) )
@@ -1956,7 +1956,7 @@ ROM_START( starw )
 ROM_END
 
 ROM_START( lrescue )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "lrescue.1",    0x0000, 0x0800, CRC(2bbc4778) SHA1(0167f1ac1501ab0b4c4e555023fa5efed59d56ae) )
 	ROM_LOAD( "lrescue.2",    0x0800, 0x0800, CRC(49e79706) SHA1(bed675bb97d59ae0132c007ccead0d096ed2ddf1) )
 	ROM_LOAD( "lrescue.3",    0x1000, 0x0800, CRC(1ac969be) SHA1(67ac47f45b9fa5c530bf6047bb7d5776b52847be) )
@@ -1964,7 +1964,7 @@ ROM_START( lrescue )
 	ROM_LOAD( "lrescue.5",    0x4000, 0x0800, CRC(58fde8bc) SHA1(663665ac5254204c1eba18357d9867034eae55eb) )
 	ROM_LOAD( "lrescue.6",    0x4800, 0x0800, CRC(bfb0f65d) SHA1(ea0943d764a16094b6e2289f62ef117c9f838c98) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color map */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color map */
 	ROM_LOAD( "7643-1.cpu",   0x0000, 0x0400, CRC(8b2e38de) SHA1(d6a757be31c3a179d31bd3709e71f9e38ec632e9) )
 	ROM_RELOAD(  			  0x0400, 0x0400 )
 ROM_END
@@ -2043,7 +2043,7 @@ VR8 = pot for adjusting total sounds
 */
 
 ROM_START( mlander )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "ml1.u36",    0x0000, 0x0800, CRC(69df529a) SHA1(ded3b4a04e28dc341b1fc5a8880bc48aa332bdb5) )
 	ROM_LOAD( "ml2.u35",    0x0800, 0x0800, CRC(3b503337) SHA1(d1056c0161d481202996811503e9970d0a0c9147) )
 	ROM_LOAD( "ml3.u34",    0x1000, 0x0800, CRC(64e53458) SHA1(629f2434eea4d31dc9db0ee7bc8364cd2bf08a04) )
@@ -2053,7 +2053,7 @@ ROM_START( mlander )
 ROM_END
 
 ROM_START( grescue )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "lrescue.1",    0x0000, 0x0800, CRC(2bbc4778) SHA1(0167f1ac1501ab0b4c4e555023fa5efed59d56ae) )
 	ROM_LOAD( "lrescue.2",    0x0800, 0x0800, CRC(49e79706) SHA1(bed675bb97d59ae0132c007ccead0d096ed2ddf1) )
 	ROM_LOAD( "lrescue.3",    0x1000, 0x0800, CRC(1ac969be) SHA1(67ac47f45b9fa5c530bf6047bb7d5776b52847be) )
@@ -2061,13 +2061,13 @@ ROM_START( grescue )
 	ROM_LOAD( "grescue.5",    0x4000, 0x0800, CRC(a419a4d6) SHA1(8eeeb31cbebffc98d2c6c5b964f9b320fcf303d2) )
 	ROM_LOAD( "lrescue.6",    0x4800, 0x0800, CRC(bfb0f65d) SHA1(ea0943d764a16094b6e2289f62ef117c9f838c98) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color map */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color map */
 	ROM_LOAD( "7643-1.cpu",   0x0000, 0x0400, CRC(8b2e38de) SHA1(d6a757be31c3a179d31bd3709e71f9e38ec632e9) )
 	ROM_RELOAD(  			  0x0400, 0x0400 )
 ROM_END
 
 ROM_START( desterth )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "36_h.bin",     0x0000, 0x0800, CRC(f86923e5) SHA1(d19935ba3d2c1c2553b3779f1a7ad8856c003dae) )
 	ROM_LOAD( "35_g.bin",     0x0800, 0x0800, CRC(797f440d) SHA1(a96917f2296ae467acc795eacc1533a2a2d2f401) )
 	ROM_LOAD( "34_f.bin",     0x1000, 0x0800, CRC(993d0846) SHA1(6be0c45add41fa7e43cac96c776cd0ebb45ade7b) )
@@ -2076,13 +2076,13 @@ ROM_START( desterth )
 	ROM_LOAD( "31_c.bin",     0x4800, 0x0800, CRC(ab019c30) SHA1(33931510a722168bcf7c30d22eac9345576b6631) )
 	ROM_LOAD( "42_b.bin",     0x5000, 0x0800, CRC(ed9dbac6) SHA1(4553f445ac32ebb1be490b02df4924f76557e8f9) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color map */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color map */
 	ROM_LOAD( "7643-1.cpu",   0x0000, 0x0400, CRC(8b2e38de) SHA1(d6a757be31c3a179d31bd3709e71f9e38ec632e9) )
 	ROM_RELOAD(  			  0x0400, 0x0400 )
 ROM_END
 
 ROM_START( lrescuem )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "48.ic36",    0x0000, 0x0400, CRC(bad5ba48) SHA1(6d8a2df172e058d16f196ad7f29430e9fd1fdaa8) )
 	ROM_LOAD( "49.ic35",    0x0400, 0x0400, CRC(a6dc23d6) SHA1(76b9105935bf239ae90b47900f64dac3032ceecd) )
 	ROM_LOAD( "50.ic34",    0x0800, 0x0400, CRC(90179fee) SHA1(35059f7399229b8d9588d34f79073fa4d3301614) )
@@ -2096,13 +2096,13 @@ ROM_START( lrescuem )
 	ROM_LOAD( "58.ic38",    0x4800, 0x0400, CRC(1b7a5644) SHA1(d26530ea11ada86f7c99b11d6faf4416a8f5a9eb) )
 	ROM_LOAD( "59.ic37",    0x4c00, 0x0400, CRC(c342b907) SHA1(327da029420c4eedabc2a0534199a008a3f341b8) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 - these don't really fit this game, but were on the PCB */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 - these don't really fit this game, but were on the PCB */
 	ROM_LOAD( "cv01-7643.2c",   0x0000, 0x0400, CRC(aac24f34) SHA1(ad110e776547fb48baac568bb50d61854537ca34) )
 	ROM_LOAD( "cv02-7643.1c",   0x0400, 0x0400, CRC(2bdf83a0) SHA1(01ffbd43964c41987e7d44816271308f9a70802b) )
 ROM_END
 
 ROM_START( cosmo )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "1.36",         0x0000, 0x0800, CRC(445c9a98) SHA1(89bce80a061e9c12544231f970d9dec801eb1b94) )
 	ROM_LOAD( "2.35",         0x0800, 0x0800, CRC(df3eb731) SHA1(fb90c1d0f2518195dd49062c9f0fd890536d89f4) )
 	ROM_LOAD( "3.34",         0x1000, 0x0800, CRC(772c813f) SHA1(a1c0d857c660fb0b838dd0466af7bf5d73bcd55d) )
@@ -2111,13 +2111,13 @@ ROM_START( cosmo )
 	ROM_LOAD( "6.31",         0x4800, 0x0800, CRC(b037f6c4) SHA1(b9a42948052b8cda8d2e4575e59909589f4e7a8d) )
 	ROM_LOAD( "7.42",         0x5000, 0x0800, CRC(c3831ea2) SHA1(8c67ef0312656ef0eeff34b8463376c736bd8ea1) )
 
-	ROM_REGION( 0x1000, RGNCLASS_PROMS, "proms", 0 )		/* color map */
+	ROM_REGION( 0x1000, "proms", 0 )		/* color map */
 	ROM_LOAD( "n-1.7d",       0x0800, 0x0800, CRC(bd8576f1) SHA1(aa5fe0a4d024f21a3bca7a6b3f5022779af6f3f4) )
 	ROM_LOAD( "n-2.6e",       0x0000, 0x0800, CRC(48f1ade5) SHA1(a1b45f82f3649cde8ae6a2ef494a3a6cdb5e65d0) )
 ROM_END
 
 ROM_START( cosmicmo )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "cosmicmo.1",   0x0000, 0x0400, CRC(d6e4e5da) SHA1(8b4275a3c71ac3fa80d17237dc04de5f586645f4) )
 	ROM_LOAD( "cosmicmo.2",   0x0400, 0x0400, CRC(8f7988e6) SHA1(b6a01d5dcab013350f8f7f3e3ebfc986bb939fe0) )
 	ROM_LOAD( "cosmicmo.3",   0x0800, 0x0400, CRC(2d2e9dc8) SHA1(dd3da4fc752e003e5e7c64bf189288133aed545b) )
@@ -2128,13 +2128,13 @@ ROM_START( cosmicmo )
 ROM_END
 
 ROM_START( cosmicm2 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "3907.bin",   0x0000, 0x1000, CRC(bbffede6) SHA1(e7505ee8e3f19557ebbfd0145dc2ae0d1c529eba) )
 	ROM_LOAD( "3906.bin",   0x4000, 0x1000, CRC(b841f894) SHA1(b1f9e1800969baab14da2fd8873b58d4707b7236) )
 ROM_END
 
 ROM_START( superinv )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "00",           0x0000, 0x0400, CRC(7a9b4485) SHA1(dde918ec106971972bf7c7e5085c1262522f7e35) )
 	ROM_LOAD( "01",           0x0400, 0x0400, CRC(7c86620d) SHA1(9e92ec0aa4eee96a7fa115a14a611c488d13b9dd) )
 	ROM_LOAD( "02",           0x0800, 0x0400, CRC(ccaf38f6) SHA1(8eb0456e8abdba0d1dda20a335a9ecbe7c38f9ed) )
@@ -2144,7 +2144,7 @@ ROM_START( superinv )
 ROM_END
 
 ROM_START( invasion )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "10136-0.0k",   0x0000, 0x0400, CRC(7a9b4485) SHA1(dde918ec106971972bf7c7e5085c1262522f7e35) )
 	ROM_LOAD( "10136-1.1k",   0x0400, 0x0400, CRC(7c86620d) SHA1(9e92ec0aa4eee96a7fa115a14a611c488d13b9dd) )
 	ROM_LOAD( "10136-2.2k",   0x0800, 0x0400, CRC(ccaf38f6) SHA1(8eb0456e8abdba0d1dda20a335a9ecbe7c38f9ed) )
@@ -2154,7 +2154,7 @@ ROM_START( invasion )
 ROM_END
 
 ROM_START( rollingc )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "rc01.bin",     0x0000, 0x0400, CRC(66fa50bf) SHA1(7451d4ff8d3b351a324aaecdbdc5b46672f5fdd0) )
 	ROM_LOAD( "rc02.bin",     0x0400, 0x0400, CRC(61c06ae4) SHA1(7685c806e20e4a4a0508a547ac08ca8f6d75bb79) )
 	ROM_LOAD( "rc03.bin",     0x0800, 0x0400, CRC(77e39fa0) SHA1(16bf88af1b97c5a2a81e105af08b8d9d1f10dcc8) )
@@ -2171,7 +2171,7 @@ ROM_START( rollingc )
 ROM_END
 
 ROM_START( schaser )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "rt13.bin",     0x0000, 0x0400, CRC(0dfbde68) SHA1(7367b138ad8448aba9222fed632a892df65cecbd) )
 	ROM_LOAD( "rt14.bin",     0x0400, 0x0400, CRC(5a508a25) SHA1(c681d0bbf49317e79b596fb094e66b8912f0e409) )
 	ROM_LOAD( "rt15.bin",     0x0800, 0x0400, CRC(2ac43a93) SHA1(d364f0940681a888c0147e06bcb01f8a0d4a24c8) )
@@ -2183,12 +2183,12 @@ ROM_START( schaser )
 	ROM_LOAD( "rt21.bin",     0x4000, 0x0400, CRC(b368ac98) SHA1(6860efe0496955db67611183be0efecda92c9c98) )
 	ROM_LOAD( "rt22.bin",     0x4400, 0x0400, CRC(6e060dfb) SHA1(614e2ecf676c3ea2f9ea869125cfffef2f713684) )
 
-	ROM_REGION( 0x0400, RGNCLASS_PROMS, "proms", 0 )		/* background color map */
+	ROM_REGION( 0x0400, "proms", 0 )		/* background color map */
 	ROM_LOAD( "rt06.ic2",     0x0000, 0x0400, CRC(950cf973) SHA1(d22df09b325835a0057ccd0d54f827b374254ac6) )
 ROM_END
 
 ROM_START( sflush )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "taitofr.005",        0xd800, 0x800, CRC(c4f08f9f) SHA1(997f216f5244942fc1a19f5c1988adbfadc301fc) )
 	ROM_LOAD( "taitofr.004",        0xe000, 0x800, CRC(87a754a5) SHA1(07c0e2c3cb7aa0086d8f4dd202a452bc6c20d4ee) )
 	ROM_LOAD( "taitofr.003",        0xe800, 0x800, CRC(5b12847f) SHA1(4b62342723dd49a387fae6637c331d7c853712a3) )
@@ -2197,7 +2197,7 @@ ROM_START( sflush )
 ROM_END
 
 ROM_START( schasrcv )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "1",     		  0x0000, 0x0400, CRC(bec2b16b) SHA1(c62210ecb64d7c38e5b63481d7fe04eb59bb1068) )
 	ROM_LOAD( "2",     		  0x0400, 0x0400, CRC(9d25e608) SHA1(4cc52a93a3ab96a0ec1d07593e17832fa59b30a1) )
 	ROM_LOAD( "3",     		  0x0800, 0x0400, CRC(113d0635) SHA1(ab5e98d0b5fc37d7d69bb5c541681a0f66460440) )
@@ -2209,13 +2209,13 @@ ROM_START( schasrcv )
 	ROM_LOAD( "9",     		  0x4000, 0x0400, CRC(3d1a2ae3) SHA1(672ad6590aebdfebc2748455fa638107f3934c41) )
 	ROM_LOAD( "10",    		  0x4400, 0x0400, CRC(037edb99) SHA1(f2fc5e61f962666e7f6bb81753ac24ea0b97e581) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 (not used, but they were on the board) */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 (not used, but they were on the board) */
 	ROM_LOAD( "cv01",         0x0000, 0x0400, CRC(037e16ac) SHA1(d585030aaff428330c91ae94d7cd5c96ebdd67dd) )
 	ROM_LOAD( "cv02",         0x0400, 0x0400, CRC(8263da38) SHA1(2e7c769d129e6f8a1a31eba1e02777bb94ac32b2) )
 ROM_END
 
 ROM_START( lupin3 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "lp12.bin",     0x0000, 0x0800, CRC(68a7f47a) SHA1(dce99b3810331d7603fa468f1dea984e571f709b) )
 	ROM_LOAD( "lp13.bin",     0x0800, 0x0800, CRC(cae9a17b) SHA1(a333ba7db45325996e3254ab36162bb7577e8a38) )
 	ROM_LOAD( "lp14.bin",     0x1000, 0x0800, CRC(3553b9e4) SHA1(6affb5b6caf08f365c0dce669e44046295c3df91) )
@@ -2226,7 +2226,7 @@ ROM_START( lupin3 )
 ROM_END
 
 ROM_START( polaris )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "ps-01",        0x0000, 0x0800, CRC(c04ce5a9) SHA1(62cc9b3b682ebecfb7600393862c65e26ff5263f) )
 	ROM_LOAD( "ps-09",        0x0800, 0x0800, CRC(9a5c8cb2) SHA1(7a8c5d74f8b431072d9476d3ef65a3fe1d639813) )
 	ROM_LOAD( "ps-08",        0x1000, 0x0800, CRC(8680d7ea) SHA1(7fd4b8a415666c36842fed80d2798b48f8b29d0d) )
@@ -2234,15 +2234,15 @@ ROM_START( polaris )
 	ROM_LOAD( "ps-05",        0x4000, 0x0800, CRC(772e31f3) SHA1(fa0b866b6df1a9217e286ca880b3bb3fb0644bf3) )
 	ROM_LOAD( "ps-10",        0x4800, 0x0800, CRC(3df77bac) SHA1(b3275c34b8d42df83df2c404c5b7d220aae651fa) )
 
-	ROM_REGION( 0x0400, RGNCLASS_PROMS, "proms", 0 )		/* background color map */
+	ROM_REGION( 0x0400, "proms", 0 )		/* background color map */
 	ROM_LOAD( "ps07",         0x0000, 0x0400, CRC(164aa05d) SHA1(41c699ce45c76a60c71294f25d8df6c6e6c1280a) )
 
-	ROM_REGION( 0x0100, RGNCLASS_USER, "user1", 0 )		/* cloud graphics */
+	ROM_REGION( 0x0100, "user1", 0 )		/* cloud graphics */
 	ROM_LOAD( "mb7052.2c",    0x0000, 0x0100, CRC(2953253b) SHA1(2fb851bc9652ca4e51d473b484ede6dab05f1b51) )
 ROM_END
 
 ROM_START( polarisa )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "ps01-1",       0x0000, 0x0800, CRC(7d41007c) SHA1(168f002fe997aac6e4141292de826d389859bb04) )
 	ROM_LOAD( "ps-09",        0x0800, 0x0800, CRC(9a5c8cb2) SHA1(7a8c5d74f8b431072d9476d3ef65a3fe1d639813) )
 	ROM_LOAD( "ps03-1",       0x1000, 0x0800, CRC(21f32415) SHA1(6ac9ae9b55e342729fe260147021ed3911a24dc2) )
@@ -2251,15 +2251,15 @@ ROM_START( polarisa )
 	ROM_LOAD( "ps-10",        0x4800, 0x0800, CRC(3df77bac) SHA1(b3275c34b8d42df83df2c404c5b7d220aae651fa) )
 	ROM_LOAD( "ps26",         0x5000, 0x0800, CRC(9d5c3d50) SHA1(a6acf9ca6e807625156cb1759269014d5830a44f) )
 
-	ROM_REGION( 0x0400, RGNCLASS_PROMS, "proms", 0 )		/* background color map */
+	ROM_REGION( 0x0400, "proms", 0 )		/* background color map */
 	ROM_LOAD( "ps07",         0x0000, 0x0400, CRC(164aa05d) SHA1(41c699ce45c76a60c71294f25d8df6c6e6c1280a) )
 
-	ROM_REGION( 0x0100, RGNCLASS_USER, "user1", 0 )		/* cloud graphics */
+	ROM_REGION( 0x0100, "user1", 0 )		/* cloud graphics */
 	ROM_LOAD( "mb7052.2c",    0x0000, 0x0100, CRC(2953253b) SHA1(2fb851bc9652ca4e51d473b484ede6dab05f1b51) )
 ROM_END
 
 ROM_START( ozmawars )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "mw01",         0x0000, 0x0800, CRC(31f4397d) SHA1(bba9765aadd608d19e2515a5edf8e0eceb70916a) )
 	ROM_LOAD( "mw02",         0x0800, 0x0800, CRC(d8e77c62) SHA1(84fc81cf9a924ecbb13a008cd7435b7d465bddf6) )
 	ROM_LOAD( "mw03",         0x1000, 0x0800, CRC(3bfa418f) SHA1(7318878202322a2263551ca463e4c70943401f68) )
@@ -2269,7 +2269,7 @@ ROM_START( ozmawars )
 ROM_END
 
 ROM_START( ozmawar2 )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "mw01",         0x0000, 0x0800, CRC(31f4397d) SHA1(bba9765aadd608d19e2515a5edf8e0eceb70916a) )
 	ROM_LOAD( "mw02",         0x0800, 0x0800, CRC(d8e77c62) SHA1(84fc81cf9a924ecbb13a008cd7435b7d465bddf6) )
 	ROM_LOAD( "oz5",          0x1000, 0x0400, CRC(5597bf52) SHA1(626c7348365ed974d416485d94d057745b5d9b96) )
@@ -2282,7 +2282,7 @@ ROM_START( ozmawar2 )
 ROM_END
 
 ROM_START( solfight )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "solfight.m",   0x0000, 0x0800, CRC(a4f2814e) SHA1(e2437e3543dcc97eeaea32babcd4aec6455581ac) )
 	ROM_LOAD( "solfight.n",   0x0800, 0x0800, CRC(5657ec07) SHA1(9a2fb398841160f59483bb70060caba37addb8a4) )
 	ROM_LOAD( "solfight.p",   0x1000, 0x0800, CRC(ef9ce96d) SHA1(96867b4f2d72f3a8827b1eb3a0748922eaa8d608) )
@@ -2292,7 +2292,7 @@ ROM_START( solfight )
 ROM_END
 
 ROM_START( spaceph )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "sv01.bin",     0x0000, 0x0400, CRC(de84771d) SHA1(13a7e5eedb826cca4d59634d38db9fcf5e65b732) )
 	ROM_LOAD( "sv02.bin",     0x0400, 0x0400, CRC(957fc661) SHA1(ac0edc901d8033619f62967f8eaf53a02947e109) )
 	ROM_LOAD( "sv03.bin",     0x0800, 0x0400, CRC(dbda38b9) SHA1(73a277616a0c236b07c9ffa66f16a27a78c12d70) )
@@ -2308,23 +2308,23 @@ ROM_START( spaceph )
 ROM_END
 
 ROM_START( ballbomb )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "tn01",         0x0000, 0x0800, CRC(551585b5) SHA1(7c17b046bdfca6ab107b7e68ba9bde6ca590c3d4) )
 	ROM_LOAD( "tn02",         0x0800, 0x0800, CRC(7e1f734f) SHA1(a15656818cd730d9bc98d00ff1e7fe3f860bd624) )
 	ROM_LOAD( "tn03",         0x1000, 0x0800, CRC(d93e20bc) SHA1(2bf72f813750cef8fad572a18fb8e9fd5bf38804) )
 	ROM_LOAD( "tn04",         0x1800, 0x0800, CRC(d0689a22) SHA1(1f6b258431b7eb878853ff979e4d97a05fb6b797) )
 	ROM_LOAD( "tn05-1",       0x4000, 0x0800, CRC(5d5e94f1) SHA1(b9f8ba38161ef4f0940c274e9d93fed4bb7db017) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 */
 	ROM_LOAD( "tn06",         0x0000, 0x0400, CRC(7ec554c4) SHA1(b638605ba2043fdca4c5e18755fa5fa81ed3db07) )
 	ROM_LOAD( "tn07",         0x0400, 0x0400, CRC(deb0ac82) SHA1(839581c4e58cb7b0c2c14cf4f239220017cc26eb) )
 
-	ROM_REGION( 0x0100, RGNCLASS_USER, "user1", 0 )		/* cloud graphics (missing) */
+	ROM_REGION( 0x0100, "user1", 0 )		/* cloud graphics (missing) */
 	ROM_LOAD( "mb7052.2c",    0x0000, 0x0100, NO_DUMP )
 ROM_END
 
 ROM_START( yosakdon )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "yd1.bin", 	  0x0000, 0x0400, CRC(607899c9) SHA1(219c0c99894715818606fba49cc75517f6f43e0c) )
 	ROM_LOAD( "yd2.bin", 	  0x0400, 0x0400, CRC(78336df4) SHA1(b0b6254568d191d2d0b9c9280a3ccf2417ef3f38) )
 	ROM_LOAD( "yd3.bin", 	  0x0800, 0x0400, CRC(c5af6d52) SHA1(c40af79fe060562c64fc316881b7d0348e11ee3f) )
@@ -2335,7 +2335,7 @@ ROM_START( yosakdon )
 ROM_END
 
 ROM_START( yosakdoa )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "yosaku1",      0x0000, 0x0400, CRC(d132f4f0) SHA1(373c7ea1bd6debcb3dad5881793b8c31dc7a01e6) )
 	ROM_LOAD( "yd2.bin", 	  0x0400, 0x0400, CRC(78336df4) SHA1(b0b6254568d191d2d0b9c9280a3ccf2417ef3f38) )
 	ROM_LOAD( "yosaku3",      0x0800, 0x0400, CRC(b1a0b3eb) SHA1(4eb80668920b45dc6216424f8ca53d753a35f4f1) )
@@ -2346,7 +2346,7 @@ ROM_START( yosakdoa )
 ROM_END
 
 ROM_START( indianbt )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "1.36",       0x0000, 0x0800, CRC(ddc2b25d) SHA1(120ae17492b79d7d2ad515de9f1e3be7f8b9d4eb) )
 	ROM_LOAD( "2.35",       0x0800, 0x0800, CRC(6499b062) SHA1(62a301d532b9fc4e7a17cbe8d2061eb0e842bdfa) )
 	ROM_LOAD( "3.34",       0x1000, 0x0800, CRC(5c51675d) SHA1(1313e8794ee6cd0252452b96d42cff7907eeaa21) )
@@ -2356,13 +2356,13 @@ ROM_START( indianbt )
 	ROM_LOAD( "7.42",       0x5000, 0x0800, CRC(7060ba0b) SHA1(366ce02b7b0a3391afef23b8b41cd98a91034830) )
 	ROM_LOAD( "8.41",       0x5800, 0x0800, CRC(eaccfc0a) SHA1(c6c2d702243bdd1d2ad5fbaaceadb5a5798577bc) )
 
-	ROM_REGION( 0x0800, RGNCLASS_PROMS, "proms", 0 )		/* color maps player 1/player 2 */
+	ROM_REGION( 0x0800, "proms", 0 )		/* color maps player 1/player 2 */
 	ROM_LOAD( "mb7054.1",   0x0000, 0x0400, CRC(4acf4db3) SHA1(842a6c9f91806b424b7cc437670b4fe0bd57dff1) )
 	ROM_LOAD( "mb7054.2",   0x0400, 0x0400, CRC(62cb3419) SHA1(3df65062945589f1df37359dbd3e30ae4b23f469) )
 ROM_END
 
 ROM_START( shuttlei )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "1.13c",   0x0000, 0x0400, CRC(b6d4f0cd) SHA1(f855a793e78ff6283288c815b59e6942513ab4f8) )
 	ROM_LOAD( "2.11c",   0x0400, 0x0400, CRC(168d6138) SHA1(e0e5ba58eb5a3a00802504c48a96d63522f9865f) )
 	ROM_LOAD( "3.13d",   0x0800, 0x0400, CRC(804bd7fb) SHA1(f019bcc2894f9b819a14c069de8f1a7d228b79eb) )
@@ -2373,7 +2373,7 @@ ROM_START( shuttlei )
 ROM_END
 
 ROM_START( darthvdr )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "rom0",           0x0000, 0x0400, CRC(b15785b6) SHA1(f453a006019dc83bd746f3a26736e913186332e6) )
 	ROM_LOAD( "rom1",           0x0400, 0x0400, CRC(95947743) SHA1(59f414de21f680e0d68ca8c4b6b538c8006cfdd6) )
 	ROM_LOAD( "rom2",           0x0800, 0x0400, CRC(19b1731f) SHA1(2383c241de8a1ed57f03ecc7ded97585a6c10c91) )
@@ -2383,7 +2383,7 @@ ROM_START( darthvdr )
 ROM_END
 
 ROM_START( astropal )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "2708.0a",   0x0000, 0x0400, CRC(e6883322) SHA1(05b0ab0dc6297209dcfdd173e762bfae3a720e8d) )
 	ROM_LOAD( "2708.1a",   0x0400, 0x0400, CRC(4401df1d) SHA1(16f3b957278aa67cb37bcd5defb6e4dd8ccf7d1f) )
 	ROM_LOAD( "2708.2a",   0x0800, 0x0400, CRC(5bac1ee4) SHA1(8c3e5f882f4798f8ed0523b60a216c989324a7c2) )

src/mame/drivers/88games.c

@@ -306,14 +306,14 @@ MACHINE_DRIVER_END
 ***************************************************************************/
 
 ROM_START( 88games )
-	ROM_REGION( 0x21000, RGNCLASS_CPU, "main", 0 ) /* code + banked roms + space for banked ram */
+	ROM_REGION( 0x21000, "main", 0 ) /* code + banked roms + space for banked ram */
     ROM_LOAD( "861m01.k18", 0x08000, 0x08000, CRC(4a4e2959) SHA1(95572686bef48b5c1ce1dedf0afc891d92aff00d) )
 	ROM_LOAD( "861m02.k16", 0x10000, 0x10000, CRC(e19f15f6) SHA1(6c801b274e87eaff7f40148381ade5b38120cc12) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* Z80 code */
+	ROM_REGION( 0x10000, "audio", 0 ) /* Z80 code */
 	ROM_LOAD( "861d01.d9", 0x00000, 0x08000, CRC(0ff1dec0) SHA1(749dc98f8740beee1383f85effc9336081315f4b) )
 
-	ROM_REGION( 0x080000, RGNCLASS_GFX, "gfx1", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION( 0x080000, "gfx1", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD16_BYTE( "861a08.a", 0x000000, 0x10000, CRC(77a00dd6) SHA1(e3667839f8ae3699236da3e312c20d571db38670) )	/* characters */
 	ROM_LOAD16_BYTE( "861a08.c", 0x000001, 0x10000, CRC(b422edfc) SHA1(b3842c8dc60975cc71812df098f29b4571b18120) )
 	ROM_LOAD16_BYTE( "861a08.b", 0x020000, 0x10000, CRC(28a8304f) SHA1(6b4037eff6d209fec29d05f1071ed3bf9c2bd098) )
@@ -323,7 +323,7 @@ ROM_START( 88games )
 	ROM_LOAD16_BYTE( "861a09.b", 0x060000, 0x10000, CRC(4917158d) SHA1(b53da3f29c9aeb59933dc3a8214cc1314e21000b) )
 	ROM_LOAD16_BYTE( "861a09.d", 0x060001, 0x10000, CRC(2bb3282c) SHA1(6ca54948a02c91543b7e595641b0edc2564f83ff) )
 
-	ROM_REGION( 0x100000, RGNCLASS_GFX, "gfx2", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION( 0x100000, "gfx2", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD16_BYTE( "861a05.a", 0x000000, 0x10000, CRC(cedc19d0) SHA1(6eb2a292d574dee06e214e61c0e08fa233ac68e8) )	/* sprites */
 	ROM_LOAD16_BYTE( "861a05.e", 0x000001, 0x10000, CRC(725af3fc) SHA1(98ac364db4b2c5682a299f4d2a288ebc8a303b1f) )
 	ROM_LOAD16_BYTE( "861a05.b", 0x020000, 0x10000, CRC(db2a8808) SHA1(dad6b127761889aac198014139cc524a4cea32e7) )
@@ -341,33 +341,33 @@ ROM_START( 88games )
 	ROM_LOAD16_BYTE( "861a06.d", 0x0e0000, 0x10000, CRC(bc70ab39) SHA1(a6fa0502ceb6862e7b1e4815326e268fd6511881) )
 	ROM_LOAD16_BYTE( "861a06.h", 0x0e0001, 0x10000, CRC(d906b79b) SHA1(905814ce708d80fd4d1a398f60faa0bc680fccaf) )
 
-	ROM_REGION( 0x040000, RGNCLASS_GFX, "gfx3", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION( 0x040000, "gfx3", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD( "861a04.a", 0x000000, 0x10000, CRC(092a8b15) SHA1(d98a81bfa4bba73805f0236f8a80da130fcb378d) )	/* zoom/rotate */
 	ROM_LOAD( "861a04.b", 0x010000, 0x10000, CRC(75744b56) SHA1(5133d8f6622796ed6b9e6a0d0f1df28f00331fc7) )
 	ROM_LOAD( "861a04.c", 0x020000, 0x10000, CRC(a00021c5) SHA1(f73f88af33387d73b4262e8652507e699926fabe) )
 	ROM_LOAD( "861a04.d", 0x030000, 0x10000, CRC(d208304c) SHA1(77dd31163c8431416ab0593f084719c914222912) )
 
-	ROM_REGION( 0x0100, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "861.g3",   0x0000, 0x0100, CRC(429785db) SHA1(d27e8e180f19d2b160f18c79520a77182a62218c) )	/* priority encoder (not used) */
 
-	ROM_REGION( 0x20000, RGNCLASS_SOUND, "upd1", 0 ) /* samples for UPD7759 #0 */
+	ROM_REGION( 0x20000, "upd1", 0 ) /* samples for UPD7759 #0 */
 	ROM_LOAD( "861a07.a", 0x000000, 0x10000, CRC(5d035d69) SHA1(9df63e004a4f52768331dfb3c3889301ac174ea1) )
 	ROM_LOAD( "861a07.b", 0x010000, 0x10000, CRC(6337dd91) SHA1(74ba58f1664abd1491598c1a9467f470304fa430) )
 
-	ROM_REGION( 0x20000, RGNCLASS_SOUND, "upd2", 0 ) /* samples for UPD7759 #1 */
+	ROM_REGION( 0x20000, "upd2", 0 ) /* samples for UPD7759 #1 */
 	ROM_LOAD( "861a07.c", 0x000000, 0x10000, CRC(5067a38b) SHA1(b5a8f7122356dd72a97e71b480835ba500116aaf) )
 	ROM_LOAD( "861a07.d", 0x010000, 0x10000, CRC(86731451) SHA1(c1410f6c7a23aa0c213878a6531d3e7eb966b0a4) )
 ROM_END
 
 ROM_START( konami88 )
-	ROM_REGION( 0x21000, RGNCLASS_CPU, "main", 0 ) /* code + banked roms + space for banked ram */
+	ROM_REGION( 0x21000, "main", 0 ) /* code + banked roms + space for banked ram */
 	ROM_LOAD( "861.e03", 0x08000, 0x08000, CRC(55979bd9) SHA1(d683cc514e2b41fc4033d5dc107ca22ba8981ada) )
 	ROM_LOAD( "861.e02", 0x10000, 0x10000, CRC(5b7e98a6) SHA1(39b6e93221d14a4695c79fb39c4eea54ec5ffb0c) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* Z80 code */
+	ROM_REGION( 0x10000, "audio", 0 ) /* Z80 code */
 	ROM_LOAD( "861d01.d9", 0x00000, 0x08000, CRC(0ff1dec0) SHA1(749dc98f8740beee1383f85effc9336081315f4b) )
 
-	ROM_REGION(  0x080000, RGNCLASS_GFX, "gfx1", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION(  0x080000, "gfx1", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD16_BYTE( "861a08.a", 0x000000, 0x10000, CRC(77a00dd6) SHA1(e3667839f8ae3699236da3e312c20d571db38670) )	/* characters */
 	ROM_LOAD16_BYTE( "861a08.c", 0x000001, 0x10000, CRC(b422edfc) SHA1(b3842c8dc60975cc71812df098f29b4571b18120) )
 	ROM_LOAD16_BYTE( "861a08.b", 0x020000, 0x10000, CRC(28a8304f) SHA1(6b4037eff6d209fec29d05f1071ed3bf9c2bd098) )
@@ -377,7 +377,7 @@ ROM_START( konami88 )
 	ROM_LOAD16_BYTE( "861a09.b", 0x060000, 0x10000, CRC(4917158d) SHA1(b53da3f29c9aeb59933dc3a8214cc1314e21000b) )
 	ROM_LOAD16_BYTE( "861a09.d", 0x060001, 0x10000, CRC(2bb3282c) SHA1(6ca54948a02c91543b7e595641b0edc2564f83ff) )
 
-	ROM_REGION( 0x100000, RGNCLASS_GFX, "gfx2", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION( 0x100000, "gfx2", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD16_BYTE( "861a05.a", 0x000000, 0x10000, CRC(cedc19d0) SHA1(6eb2a292d574dee06e214e61c0e08fa233ac68e8) )	/* sprites */
 	ROM_LOAD16_BYTE( "861a05.e", 0x000001, 0x10000, CRC(725af3fc) SHA1(98ac364db4b2c5682a299f4d2a288ebc8a303b1f) )
 	ROM_LOAD16_BYTE( "861a05.b", 0x020000, 0x10000, CRC(db2a8808) SHA1(dad6b127761889aac198014139cc524a4cea32e7) )
@@ -395,33 +395,33 @@ ROM_START( konami88 )
 	ROM_LOAD16_BYTE( "861a06.d", 0x0e0000, 0x10000, CRC(bc70ab39) SHA1(a6fa0502ceb6862e7b1e4815326e268fd6511881) )
 	ROM_LOAD16_BYTE( "861a06.h", 0x0e0001, 0x10000, CRC(d906b79b) SHA1(905814ce708d80fd4d1a398f60faa0bc680fccaf) )
 
-	ROM_REGION( 0x040000, RGNCLASS_GFX, "gfx3", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION( 0x040000, "gfx3", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD( "861a04.a", 0x000000, 0x10000, CRC(092a8b15) SHA1(d98a81bfa4bba73805f0236f8a80da130fcb378d) )	/* zoom/rotate */
 	ROM_LOAD( "861a04.b", 0x010000, 0x10000, CRC(75744b56) SHA1(5133d8f6622796ed6b9e6a0d0f1df28f00331fc7) )
 	ROM_LOAD( "861a04.c", 0x020000, 0x10000, CRC(a00021c5) SHA1(f73f88af33387d73b4262e8652507e699926fabe) )
 	ROM_LOAD( "861a04.d", 0x030000, 0x10000, CRC(d208304c) SHA1(77dd31163c8431416ab0593f084719c914222912) )
 
-	ROM_REGION( 0x0100, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "861.g3",   0x0000, 0x0100, CRC(429785db) SHA1(d27e8e180f19d2b160f18c79520a77182a62218c) )	/* priority encoder (not used) */
 
-	ROM_REGION( 0x20000, RGNCLASS_SOUND, "upd1", 0 ) /* samples for UPD7759 #0 */
+	ROM_REGION( 0x20000, "upd1", 0 ) /* samples for UPD7759 #0 */
 	ROM_LOAD( "861a07.a", 0x000000, 0x10000, CRC(5d035d69) SHA1(9df63e004a4f52768331dfb3c3889301ac174ea1) )
 	ROM_LOAD( "861a07.b", 0x010000, 0x10000, CRC(6337dd91) SHA1(74ba58f1664abd1491598c1a9467f470304fa430) )
 
-	ROM_REGION( 0x20000, RGNCLASS_SOUND, "upd2", 0 ) /* samples for UPD7759 #1 */
+	ROM_REGION( 0x20000, "upd2", 0 ) /* samples for UPD7759 #1 */
 	ROM_LOAD( "861a07.c", 0x000000, 0x10000, CRC(5067a38b) SHA1(b5a8f7122356dd72a97e71b480835ba500116aaf) )
 	ROM_LOAD( "861a07.d", 0x010000, 0x10000, CRC(86731451) SHA1(c1410f6c7a23aa0c213878a6531d3e7eb966b0a4) )
 ROM_END
 
 ROM_START( hypsptsp )
-	ROM_REGION( 0x21000, RGNCLASS_CPU, "main", 0 ) /* code + banked roms + space for banked ram */
+	ROM_REGION( 0x21000, "main", 0 ) /* code + banked roms + space for banked ram */
 	ROM_LOAD( "861f03.k18", 0x08000, 0x08000, CRC(8c61aebd) SHA1(de720acfe07fd70fe467f9c73122e0fbeab2b8c8) )
 	ROM_LOAD( "861f02.k16", 0x10000, 0x10000, CRC(d2460c28) SHA1(936220aa3983ffa2330843f683347768772561af) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* Z80 code */
+	ROM_REGION( 0x10000, "audio", 0 ) /* Z80 code */
 	ROM_LOAD( "861d01.d9", 0x00000, 0x08000, CRC(0ff1dec0) SHA1(749dc98f8740beee1383f85effc9336081315f4b) )
 
-	ROM_REGION(  0x080000, RGNCLASS_GFX, "gfx1", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION(  0x080000, "gfx1", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD16_BYTE( "861a08.a", 0x000000, 0x10000, CRC(77a00dd6) SHA1(e3667839f8ae3699236da3e312c20d571db38670) )	/* characters */
 	ROM_LOAD16_BYTE( "861a08.c", 0x000001, 0x10000, CRC(b422edfc) SHA1(b3842c8dc60975cc71812df098f29b4571b18120) )
 	ROM_LOAD16_BYTE( "861a08.b", 0x020000, 0x10000, CRC(28a8304f) SHA1(6b4037eff6d209fec29d05f1071ed3bf9c2bd098) )
@@ -431,7 +431,7 @@ ROM_START( hypsptsp )
 	ROM_LOAD16_BYTE( "861a09.b", 0x060000, 0x10000, CRC(4917158d) SHA1(b53da3f29c9aeb59933dc3a8214cc1314e21000b) )
 	ROM_LOAD16_BYTE( "861a09.d", 0x060001, 0x10000, CRC(2bb3282c) SHA1(6ca54948a02c91543b7e595641b0edc2564f83ff) )
 
-	ROM_REGION( 0x100000, RGNCLASS_GFX, "gfx2", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION( 0x100000, "gfx2", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD16_BYTE( "861a05.a", 0x000000, 0x10000, CRC(cedc19d0) SHA1(6eb2a292d574dee06e214e61c0e08fa233ac68e8) )	/* sprites */
 	ROM_LOAD16_BYTE( "861a05.e", 0x000001, 0x10000, CRC(725af3fc) SHA1(98ac364db4b2c5682a299f4d2a288ebc8a303b1f) )
 	ROM_LOAD16_BYTE( "861a05.b", 0x020000, 0x10000, CRC(db2a8808) SHA1(dad6b127761889aac198014139cc524a4cea32e7) )
@@ -449,20 +449,20 @@ ROM_START( hypsptsp )
 	ROM_LOAD16_BYTE( "861a06.d", 0x0e0000, 0x10000, CRC(bc70ab39) SHA1(a6fa0502ceb6862e7b1e4815326e268fd6511881) )
 	ROM_LOAD16_BYTE( "861a06.h", 0x0e0001, 0x10000, CRC(d906b79b) SHA1(905814ce708d80fd4d1a398f60faa0bc680fccaf) )
 
-	ROM_REGION( 0x040000, RGNCLASS_GFX, "gfx3", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
+	ROM_REGION( 0x040000, "gfx3", 0 ) /* graphics ( dont dispose as the program can read them, 0 ) */
 	ROM_LOAD( "861a04.a", 0x000000, 0x10000, CRC(092a8b15) SHA1(d98a81bfa4bba73805f0236f8a80da130fcb378d) )	/* zoom/rotate */
 	ROM_LOAD( "861a04.b", 0x010000, 0x10000, CRC(75744b56) SHA1(5133d8f6622796ed6b9e6a0d0f1df28f00331fc7) )
 	ROM_LOAD( "861a04.c", 0x020000, 0x10000, CRC(a00021c5) SHA1(f73f88af33387d73b4262e8652507e699926fabe) )
 	ROM_LOAD( "861a04.d", 0x030000, 0x10000, CRC(d208304c) SHA1(77dd31163c8431416ab0593f084719c914222912) )
 
-	ROM_REGION( 0x0100, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "861.g3",   0x0000, 0x0100, CRC(429785db) SHA1(d27e8e180f19d2b160f18c79520a77182a62218c) )	/* priority encoder (not used) */
 
-	ROM_REGION( 0x20000, RGNCLASS_SOUND, "upd1", 0 ) /* samples for UPD7759 #0 */
+	ROM_REGION( 0x20000, "upd1", 0 ) /* samples for UPD7759 #0 */
 	ROM_LOAD( "861a07.a", 0x000000, 0x10000, CRC(5d035d69) SHA1(9df63e004a4f52768331dfb3c3889301ac174ea1) )
 	ROM_LOAD( "861a07.b", 0x010000, 0x10000, CRC(6337dd91) SHA1(74ba58f1664abd1491598c1a9467f470304fa430) )
 
-	ROM_REGION( 0x20000, RGNCLASS_SOUND, "upd2", 0 ) /* samples for UPD7759 #1 */
+	ROM_REGION( 0x20000, "upd2", 0 ) /* samples for UPD7759 #1 */
 	ROM_LOAD( "861a07.c", 0x000000, 0x10000, CRC(5067a38b) SHA1(b5a8f7122356dd72a97e71b480835ba500116aaf) )
 	ROM_LOAD( "861a07.d", 0x010000, 0x10000, CRC(86731451) SHA1(c1410f6c7a23aa0c213878a6531d3e7eb966b0a4) )
 ROM_END
@@ -471,7 +471,7 @@ ROM_END
 
 static void k88games_banking( int lines )
 {
-	UINT8 *RAM = memory_region(Machine, RGNCLASS_CPU, "main");
+	UINT8 *RAM = memory_region(Machine, "main");
 	int offs;
 
 logerror("%04x: bank select %02x\n",activecpu_get_pc(),lines);
@@ -512,7 +512,7 @@ logerror("%04x: bank select %02x\n",activecpu_get_pc(),lines);
 static MACHINE_RESET( 88games )
 {
 	cpunum_set_info_fct(0, CPUINFO_PTR_KONAMI_SETLINES_CALLBACK, (genf *)k88games_banking);
-	paletteram = &memory_region(machine, RGNCLASS_CPU, "main")[0x20000];
+	paletteram = &memory_region(machine, "main")[0x20000];
 }
 
 

src/mame/drivers/ace.c

@@ -334,7 +334,7 @@ MACHINE_DRIVER_END
 ***************************************************************************/
 
 ROM_START( ace )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "ace.a1",		0x0000, 0x0200, CRC(16811834) SHA1(5502812dd161908eea3fa8851d7e5c1e22b0f8ff) )
 	ROM_LOAD( "ace.a2",		0x0200, 0x0200, CRC(f9eae80e) SHA1(8865b86c7b5d57c76312c16f8a614bf35ffaf532) )
 	ROM_LOAD( "ace.a3",		0x0400, 0x0200, CRC(c5c63b8c) SHA1(2079dd12ff0c4aafec19aeb9baa70fc9b6788356) )
@@ -342,7 +342,7 @@ ROM_START( ace )
 	ROM_LOAD( "ace.a5",		0x0800, 0x0200, CRC(623c58e7) SHA1(a92418bc323a1ae76eae8e094e4d6ebd1e8da14e) )
 
 	/* not used - I couldn't guess when this should be displayed */
-	ROM_REGION( 0x0200, RGNCLASS_GFX, "gfx1", 0 )
+	ROM_REGION( 0x0200, "gfx1", 0 )
 	ROM_LOAD( "ace.k4",		0x0000, 0x0200, CRC(daa05ec6) SHA1(8b71ffb802293dc93f6b492ff128a704e676a5fd) )
 
 ROM_END

src/mame/drivers/acefruit.c

@@ -571,7 +571,7 @@ MACHINE_DRIVER_END
 
 static DRIVER_INIT( sidewndr )
 {
-	UINT8 *ROM = memory_region( machine, RGNCLASS_CPU, "main" );
+	UINT8 *ROM = memory_region( machine, "main" );
 	/* replace "ret nc" ( 0xd0 ) with "di" */
 	ROM[ 0 ] = 0xf3;
 	/* this is either a bad dump or the cpu core should set the carry flag on reset */
@@ -584,13 +584,13 @@ static DRIVER_INIT( sidewndr )
 ***************************************************************************/
 
 ROM_START( sidewndr )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "2_h09.bin",    0x000000, 0x000800, BAD_DUMP CRC(141f3b0c) SHA1(1704feba950fe7aa939b9ed54c37264d10527d11) )
 	ROM_LOAD( "2_h10.bin",    0x000800, 0x000800, CRC(36a2d4af) SHA1(2388e22245497240e5721895d94d2ccd1f579eff) )
 	ROM_LOAD( "2_h11.bin",    0x001000, 0x000800, CRC(e2932643) SHA1(e1c0cd5d0cd332519432cbefa8718362a6cd1ccc) )
 	ROM_LOAD( "2_h12.bin",    0x001800, 0x000800, CRC(26af0b1f) SHA1(36f0e54982688b9d5a24a6986a847ac69ee0a355) )
 
-	ROM_REGION( 0x2000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )	/* 8k for graphics */
+	ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE )	/* 8k for graphics */
 	ROM_LOAD( "2_h05.bin",    0x000000, 0x000800, CRC(64b64cff) SHA1(c11f2bd2af68ae7f104b711deb7f6509fdbaeb8f) )
 	ROM_LOAD( "2_h06.bin",    0x000800, 0x000800, CRC(6b96a586) SHA1(6d5ab8fefe37ca4dbc5057ebf31f12b33dbdf5c0) )
 	ROM_LOAD( "2_h07.bin",    0x001000, 0x000800, CRC(3a8e68a2) SHA1(2ffe07360f57f0f11ecf326f00905747d9b66811) )
@@ -598,13 +598,13 @@ ROM_START( sidewndr )
 ROM_END
 
 ROM_START( spellbnd )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "h9.bin",       0x000000, 0x000800, CRC(9919fcfa) SHA1(04167b12ee9e60ef891893a305a35d3f2eccb0bb) )
 	ROM_LOAD( "h10.bin",      0x000800, 0x000800, CRC(90502d00) SHA1(3bdd859d9146df2eb97b4517c446182569a55a46) )
 	ROM_LOAD( "h11.bin",      0x001000, 0x000800, CRC(7375166c) SHA1(f05b01941423fd36e0a5d3aa913a594e4e7aa5d4) )
 	ROM_LOAD( "h12.bin",      0x001800, 0x000800, CRC(4546c68c) SHA1(92104e2005fc772ea9f70451d9d674f95d3f0ba9) )
 
-	ROM_REGION( 0x2000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )	/* 8k for graphics */
+	ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE )	/* 8k for graphics */
 	ROM_LOAD( "h5.bin",       0x000000, 0x000800, CRC(198da32c) SHA1(bf6c4ddcda0503095d310e08057dd88154952ef4) )
 	ROM_LOAD( "h6.bin",       0x000800, 0x000800, CRC(e777130f) SHA1(3421c6f399e5ec749f1908f6b4ebff7761c6c5d9) )
 	ROM_LOAD( "h7.bin",       0x001000, 0x000800, CRC(bfed5b8f) SHA1(f95074e8809297eec67da9d7e33ae1dd1c5eabc0) )
@@ -661,7 +661,7 @@ Notes:
 */
 
 ROM_START( starspnr )
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x10000, "main", 0 )
 	ROM_LOAD( "h9.h9",        0x00e000, 0x0800, CRC(083068aa) SHA1(160a5f3bf33d0a53354f98295cd67022762928b6) )
 	ROM_CONTINUE(             0x000000, 0x0800 )
 	ROM_LOAD( "h10.h10",      0x00e800, 0x0800, CRC(a0a96e55) SHA1(de4dc0da5a1f358085817690cc6bdc8d94a849f8) )
@@ -671,13 +671,13 @@ ROM_START( starspnr )
 	ROM_LOAD( "h12.h12",      0x00f800, 0x0800, CRC(8571f3f5) SHA1(e8b60a604a4a0368b6063b15b328c68f351cb740) ) /* bad dump ? nothing of interest 0xf800-0xffff */
 	ROM_CONTINUE(             0x001800, 0x0800 )
 
-	ROM_REGION( 0x2000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE ) /* 8k for graphics */
+	ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE ) /* 8k for graphics */
 	ROM_LOAD( "5.h5",         0x000000, 0x000800, CRC(df49876f) SHA1(68077304f096491baeddc1d6b4dc62f90de71903) )
 	ROM_LOAD( "6.h6",         0x000800, 0x000800, CRC(d992e2f6) SHA1(7841efec7d81689c82b8da501cce743436e7e8d4) )
 	ROM_LOAD( "7.h7",         0x001000, 0x000800, CRC(d5a40e88) SHA1(5cac8d85123720cdbb8b4630b14a27cf0ceef33f) )
 	ROM_LOAD( "8.h8",         0x001800, 0x000800, CRC(0dd38c3c) SHA1(4da0cd00c76d3be2164f141ccd8c72dd9578ee61) )
 
-	ROM_REGION( 0x300, RGNCLASS_PROMS, "proms", 0 )
+	ROM_REGION( 0x300, "proms", 0 )
 	ROM_LOAD( "16-1-101.b9",  0x0000, 0x0100, NO_DUMP )
 	ROM_LOAD( "16-1-101.b10", 0x0100, 0x0100, NO_DUMP )
 	ROM_LOAD( "16-1-101.b11", 0x0200, 0x0100, NO_DUMP )

src/mame/drivers/acommand.c

@@ -553,17 +553,17 @@ MACHINE_DRIVER_END
 ***************************************************************************/
 
 ROM_START( acommand )
-	ROM_REGION( 0x040000, RGNCLASS_CPU, "main", 0 )
+	ROM_REGION( 0x040000, "main", 0 )
 	ROM_LOAD16_BYTE( "jalcf3.bin",   0x000000, 0x020000, CRC(f031abf7) SHA1(e381742fd6a6df4ddae42ddb3a074a55dc550b3c) )
 	ROM_LOAD16_BYTE( "jalcf4.bin",   0x000001, 0x020000, CRC(dd0c0540) SHA1(3e788fcb30ae725bd0ec9b57424e3946db1e946f) )
 
-	ROM_REGION( 0x20000, RGNCLASS_GFX, "gfx1", 0 ) /* BG0 */
+	ROM_REGION( 0x20000, "gfx1", 0 ) /* BG0 */
 	ROM_LOAD( "jalcf6.bin",   0x000000, 0x020000, CRC(442173d6) SHA1(56c02bc2761967040127977ecabe844fc45e2218) )
 
-	ROM_REGION( 0x080000, RGNCLASS_GFX, "gfx2", 0 ) /* BG1 */
+	ROM_REGION( 0x080000, "gfx2", 0 ) /* BG1 */
 	ROM_LOAD( "jalcf5.bin",   0x000000, 0x080000, CRC(ff0be97f) SHA1(5ccab778318dec30849d7b7f25091d4aab8bde32) )
 
-	ROM_REGION( 0x400000, RGNCLASS_GFX, "gfx3", 0 ) /* SPR */
+	ROM_REGION( 0x400000, "gfx3", 0 ) /* SPR */
 	ROM_LOAD16_BYTE( "jalgp1.bin",   0x000000, 0x080000, CRC(c4aeeae2) SHA1(ee0d3dd93a604f8e1a96b55c4a1cd001d49f1157) )
 	ROM_LOAD16_BYTE( "jalgp2.bin",   0x000001, 0x080000, CRC(f0e4e80e) SHA1(08252ef8b5e309cce2d4654410142f4ae9e3ef22) )
 	ROM_LOAD16_BYTE( "jalgp3.bin",   0x100000, 0x080000, CRC(7acebd83) SHA1(64be95186d62003b637fcdf45a9c0b7aab182116) )
@@ -573,13 +573,13 @@ ROM_START( acommand )
 	ROM_LOAD16_BYTE( "jalgp7.bin",   0x300000, 0x080000, CRC(44b71098) SHA1(a6ec2573f9a266d4f8f315f6e99b12525011f512) )
 	ROM_LOAD16_BYTE( "jalgp8.bin",   0x300001, 0x080000, CRC(ce0b7838) SHA1(46e34971cb62565a3948d8c0a18086648c32e13b) )
 
-	ROM_REGION( 0x100000, RGNCLASS_SOUND, "oki2", 0 )
+	ROM_REGION( 0x100000, "oki2", 0 )
 	ROM_LOAD( "jalcf1.bin",   0x000000, 0x100000, CRC(24af21d3) SHA1(f68ab81a6c833b57ae9eef916a1c8578f3d893dd) )
 
-	ROM_REGION( 0x100000, RGNCLASS_SOUND, "oki1", 0 )
+	ROM_REGION( 0x100000, "oki1", 0 )
 	ROM_LOAD( "jalcf2.bin",   0x000000, 0x100000, CRC(b982fd97) SHA1(35ee5b1b9be762ccfefda24d73e329ceea876deb) )
 
-	ROM_REGION( 0x100000, RGNCLASS_USER, "user1", 0 ) /* ? these two below are identical*/
+	ROM_REGION( 0x100000, "user1", 0 ) /* ? these two below are identical*/
 	ROM_LOAD( "jalmr14.bin",   0x000000, 0x080000, CRC(9d428fb7) SHA1(02f72938d73db932bd217620a175a05215f6016a) )
 	ROM_LOAD( "jalmr17.bin",   0x080000, 0x080000, CRC(9d428fb7) SHA1(02f72938d73db932bd217620a175a05215f6016a) )
 ROM_END

src/mame/drivers/actfancr.c

@@ -377,19 +377,19 @@ MACHINE_DRIVER_END
 /******************************************************************************/
 
 ROM_START( actfancr )
-	ROM_REGION( 0x30000, RGNCLASS_CPU, "main", 0 ) /* Need to allow full RAM allocation for now */
+	ROM_REGION( 0x30000, "main", 0 ) /* Need to allow full RAM allocation for now */
 	ROM_LOAD( "fe08-2.bin", 0x00000, 0x10000, CRC(0d36fbfa) SHA1(cef5cfd053beac5ca2ac52421024c316bdbfba42) )
 	ROM_LOAD( "fe09-2.bin", 0x10000, 0x10000, CRC(27ce2bb1) SHA1(52a423dfc2bba7b3330d1a10f4149ae6eeb9198c) )
 	ROM_LOAD( "10",   0x20000, 0x10000, CRC(cabad137) SHA1(41ca833649671a29e9395968cde2be8137a9ff0a) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* 6502 Sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* 6502 Sound CPU */
 	ROM_LOAD( "17-1", 0x08000, 0x8000, CRC(289ad106) SHA1(cf1b32ac41d3d92860fab04d82a08efe57b6ecf3) )
 
-	ROM_REGION( 0x20000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x20000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "15", 0x00000, 0x10000, CRC(a1baf21e) SHA1(b85cf9180efae6c95cc0310064b52a78e591826a) ) /* Chars */
 	ROM_LOAD( "16", 0x10000, 0x10000, CRC(22e64730) SHA1(f1376c6e2c9d021eca7ccee3daab00593ba724b6) )
 
-	ROM_REGION( 0x60000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x60000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "02", 0x00000, 0x10000, CRC(b1db0efc) SHA1(a7bd7748ea37f473499ba5bf8ab4995b9240ff48) ) /* Sprites */
 	ROM_LOAD( "03", 0x10000, 0x08000, CRC(f313e04f) SHA1(fe69758910d38f742971c1027fc8f498c88262b1) )
 	ROM_LOAD( "06", 0x18000, 0x10000, CRC(8cb6dd87) SHA1(fab4fe76d2426c906a9070cbf7ce81200ba27ff6) )
@@ -399,30 +399,30 @@ ROM_START( actfancr )
 	ROM_LOAD( "04", 0x48000, 0x10000, CRC(bcf41795) SHA1(1d18afc974ac43fe6194e2840bbb2e93cd2b6cff) )
 	ROM_LOAD( "05", 0x58000, 0x08000, CRC(d38b94aa) SHA1(773d01427744fda9104f673d2b4183a0f7471a39) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "14", 0x00000, 0x10000, CRC(d6457420) SHA1(d03d2e944e768b297ec0c3389320c42bc0259d00) ) /* Tiles */
 	ROM_LOAD( "12", 0x10000, 0x10000, CRC(08787b7a) SHA1(23b10b75c4cbff8effadf4c6ed15d90b87648ce9) )
 	ROM_LOAD( "13", 0x20000, 0x10000, CRC(c30c37dc) SHA1(0f7a325738eafa85239497e2b97aa51a6f2ffc4d) )
 	ROM_LOAD( "11", 0x30000, 0x10000, CRC(1f006d9f) SHA1(74bc2d4d022ad7c65be781f974919262cacb4b64) )
 
-	ROM_REGION( 0x10000, RGNCLASS_SOUND, "oki", 0 ) /* ADPCM sounds */
+	ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
 	ROM_LOAD( "18",   0x00000, 0x10000, CRC(5c55b242) SHA1(62ba60b2f02483875da12aefe849f7e2fd137ef1) )
 ROM_END
 
 ROM_START( actfanc1 )
-	ROM_REGION( 0x30000, RGNCLASS_CPU, "main", 0 ) /* Need to allow full RAM allocation for now */
+	ROM_REGION( 0x30000, "main", 0 ) /* Need to allow full RAM allocation for now */
 	ROM_LOAD( "08-1", 0x00000, 0x10000, CRC(3bf214a4) SHA1(f7513672b2292d3acb4332b392695888bf6560a5) )
 	ROM_LOAD( "09-1", 0x10000, 0x10000, CRC(13ae78d5) SHA1(eba77d3dbfe273e18c7fa9c0ca305ac2468f9381) )
 	ROM_LOAD( "10",   0x20000, 0x10000, CRC(cabad137) SHA1(41ca833649671a29e9395968cde2be8137a9ff0a) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* 6502 Sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* 6502 Sound CPU */
 	ROM_LOAD( "17-1", 0x08000, 0x8000, CRC(289ad106) SHA1(cf1b32ac41d3d92860fab04d82a08efe57b6ecf3) )
 
-	ROM_REGION( 0x20000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x20000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "15", 0x00000, 0x10000, CRC(a1baf21e) SHA1(b85cf9180efae6c95cc0310064b52a78e591826a) ) /* Chars */
 	ROM_LOAD( "16", 0x10000, 0x10000, CRC(22e64730) SHA1(f1376c6e2c9d021eca7ccee3daab00593ba724b6) )
 
-	ROM_REGION( 0x60000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x60000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "02", 0x00000, 0x10000, CRC(b1db0efc) SHA1(a7bd7748ea37f473499ba5bf8ab4995b9240ff48) ) /* Sprites */
 	ROM_LOAD( "03", 0x10000, 0x08000, CRC(f313e04f) SHA1(fe69758910d38f742971c1027fc8f498c88262b1) )
 	ROM_LOAD( "06", 0x18000, 0x10000, CRC(8cb6dd87) SHA1(fab4fe76d2426c906a9070cbf7ce81200ba27ff6) )
@@ -432,30 +432,30 @@ ROM_START( actfanc1 )
 	ROM_LOAD( "04", 0x48000, 0x10000, CRC(bcf41795) SHA1(1d18afc974ac43fe6194e2840bbb2e93cd2b6cff) )
 	ROM_LOAD( "05", 0x58000, 0x08000, CRC(d38b94aa) SHA1(773d01427744fda9104f673d2b4183a0f7471a39) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "14", 0x00000, 0x10000, CRC(d6457420) SHA1(d03d2e944e768b297ec0c3389320c42bc0259d00) ) /* Tiles */
 	ROM_LOAD( "12", 0x10000, 0x10000, CRC(08787b7a) SHA1(23b10b75c4cbff8effadf4c6ed15d90b87648ce9) )
 	ROM_LOAD( "13", 0x20000, 0x10000, CRC(c30c37dc) SHA1(0f7a325738eafa85239497e2b97aa51a6f2ffc4d) )
 	ROM_LOAD( "11", 0x30000, 0x10000, CRC(1f006d9f) SHA1(74bc2d4d022ad7c65be781f974919262cacb4b64) )
 
-	ROM_REGION( 0x10000, RGNCLASS_SOUND, "oki", 0 ) /* ADPCM sounds */
+	ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
 	ROM_LOAD( "18",   0x00000, 0x10000, CRC(5c55b242) SHA1(62ba60b2f02483875da12aefe849f7e2fd137ef1) )
 ROM_END
 
 ROM_START( actfancj )
-	ROM_REGION( 0x30000, RGNCLASS_CPU, "main", 0 ) /* Need to allow full RAM allocation for now */
+	ROM_REGION( 0x30000, "main", 0 ) /* Need to allow full RAM allocation for now */
 	ROM_LOAD( "fd08-1.bin", 0x00000, 0x10000, CRC(69004b60) SHA1(7c6b876ca04377d2aa2d3c3f19d8e6cc7345363d) )
 	ROM_LOAD( "fd09-1.bin", 0x10000, 0x10000, CRC(a455ae3e) SHA1(960798271c8370c1c4ffce2a453f59d7a301c9f9) )
 	ROM_LOAD( "10",   0x20000, 0x10000, CRC(cabad137) SHA1(41ca833649671a29e9395968cde2be8137a9ff0a) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* 6502 Sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* 6502 Sound CPU */
 	ROM_LOAD( "17-1", 0x08000, 0x8000, CRC(289ad106) SHA1(cf1b32ac41d3d92860fab04d82a08efe57b6ecf3) )
 
-	ROM_REGION( 0x20000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x20000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "15", 0x00000, 0x10000, CRC(a1baf21e) SHA1(b85cf9180efae6c95cc0310064b52a78e591826a) ) /* Chars */
 	ROM_LOAD( "16", 0x10000, 0x10000, CRC(22e64730) SHA1(f1376c6e2c9d021eca7ccee3daab00593ba724b6) )
 
-	ROM_REGION( 0x60000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x60000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "02", 0x00000, 0x10000, CRC(b1db0efc) SHA1(a7bd7748ea37f473499ba5bf8ab4995b9240ff48) ) /* Sprites */
 	ROM_LOAD( "03", 0x10000, 0x08000, CRC(f313e04f) SHA1(fe69758910d38f742971c1027fc8f498c88262b1) )
 	ROM_LOAD( "06", 0x18000, 0x10000, CRC(8cb6dd87) SHA1(fab4fe76d2426c906a9070cbf7ce81200ba27ff6) )
@@ -465,30 +465,30 @@ ROM_START( actfancj )
 	ROM_LOAD( "04", 0x48000, 0x10000, CRC(bcf41795) SHA1(1d18afc974ac43fe6194e2840bbb2e93cd2b6cff) )
 	ROM_LOAD( "05", 0x58000, 0x08000, CRC(d38b94aa) SHA1(773d01427744fda9104f673d2b4183a0f7471a39) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "14", 0x00000, 0x10000, CRC(d6457420) SHA1(d03d2e944e768b297ec0c3389320c42bc0259d00) ) /* Tiles */
 	ROM_LOAD( "12", 0x10000, 0x10000, CRC(08787b7a) SHA1(23b10b75c4cbff8effadf4c6ed15d90b87648ce9) )
 	ROM_LOAD( "13", 0x20000, 0x10000, CRC(c30c37dc) SHA1(0f7a325738eafa85239497e2b97aa51a6f2ffc4d) )
 	ROM_LOAD( "11", 0x30000, 0x10000, CRC(1f006d9f) SHA1(74bc2d4d022ad7c65be781f974919262cacb4b64) )
 
-	ROM_REGION( 0x10000, RGNCLASS_SOUND, "oki", 0 ) /* ADPCM sounds */
+	ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
 	ROM_LOAD( "18",   0x00000, 0x10000, CRC(5c55b242) SHA1(62ba60b2f02483875da12aefe849f7e2fd137ef1) )
 ROM_END
 
 ROM_START( triothep )
-	ROM_REGION( 0x40000, RGNCLASS_CPU, "main", 0 ) /* Need to allow full RAM allocation for now */
+	ROM_REGION( 0x40000, "main", 0 ) /* Need to allow full RAM allocation for now */
 	ROM_LOAD( "fg-16.bin", 0x00000, 0x20000, CRC(7238355a) SHA1(4ac6c3fd808e7c94025972fdb45956bd707ec89f) )
 	ROM_LOAD( "fg-15.bin", 0x20000, 0x10000, CRC(1c0551ab) SHA1(1f90f80db44d92af4b233bc16cb1023db2797e8a) )
 	ROM_LOAD( "fg-14.bin", 0x30000, 0x10000, CRC(4ba7de4a) SHA1(bf552fa33746f3d27f9b193424a38fef58fe0765) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* 6502 Sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* 6502 Sound CPU */
 	ROM_LOAD( "fg-18.bin", 0x00000, 0x10000, CRC(9de9ee63) SHA1(c91b824b9a791cb90365d45c8e1b69e67f7d065f) )
 
-	ROM_REGION( 0x20000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x20000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "fg-12.bin", 0x00000, 0x10000, CRC(15fb49f2) SHA1(a81ff1dbc813ab9b37edb832e01aab9a9a3ed5a1) ) /* Chars */
 	ROM_LOAD( "fg-13.bin", 0x10000, 0x10000, CRC(e20c9623) SHA1(b5a58599a016378f34217396212f81ede9272598) )
 
-	ROM_REGION( 0x60000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x60000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "fg-11.bin", 0x00000, 0x10000, CRC(1143ebd7) SHA1(0ef2cf40f852bf0842beeb9727508e28437ab54b) ) /* Sprites */
 	ROM_LOAD( "fg-10.bin", 0x10000, 0x08000, CRC(4b6b477a) SHA1(77486e0ff957cbfdae16d2b5977e95b7a7ced948) )
 	ROM_LOAD( "fg-09.bin", 0x18000, 0x10000, CRC(6bf6c803) SHA1(c16fd4b7e1e86db48c6e78a4b5dcd42e8269b465) )
@@ -498,31 +498,31 @@ ROM_START( triothep )
 	ROM_LOAD( "fg-01.bin", 0x48000, 0x10000, CRC(4987f7ac) SHA1(e8e81b15f6b6c8597d34eef3cabb89b90d3ae7f5) )
 	ROM_LOAD( "fg-00.bin", 0x58000, 0x08000, CRC(41232442) SHA1(1c10a4f5607e41d6239cb478ed7355963ad6b2d0) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "fg-04.bin", 0x00000, 0x10000, CRC(7cea3c87) SHA1(b58156140a75f88ee6ec97ca7cdc02619ec51726) ) /* Tiles */
 	ROM_LOAD( "fg-06.bin", 0x10000, 0x10000, CRC(5e7f3e8f) SHA1(c92ec281b3985b442957f7d9237eb38a6d621cd4) )
 	ROM_LOAD( "fg-05.bin", 0x20000, 0x10000, CRC(8bb13f05) SHA1(f524cb0a38d0025c93124fc329d913e000155e9b) )
 	ROM_LOAD( "fg-07.bin", 0x30000, 0x10000, CRC(0d7affc3) SHA1(59f9fbf13216aaf67c7d1ad3a11a1738c4afd9e5) )
 
-	ROM_REGION( 0x10000, RGNCLASS_SOUND, "oki", 0 ) /* ADPCM sounds */
+	ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
 	ROM_LOAD( "fg-17.bin", 0x00000, 0x10000, CRC(f0ab0d05) SHA1(29d3ab513a8d46a1cb70f5333fa56bb787a58288) )
 ROM_END
 
 /* All roms are FF even the ones matching the parent FG roms */
 ROM_START( triothej )
-	ROM_REGION( 0x40000, RGNCLASS_CPU, "main", 0 ) /* Need to allow full RAM allocation for now */
+	ROM_REGION( 0x40000, "main", 0 ) /* Need to allow full RAM allocation for now */
 	ROM_LOAD( "ff-16.bin", 0x00000, 0x20000, CRC(84d7e1b6) SHA1(28381d2e1f6d22a959383eb2e8d73f2e03f4d39f) )
 	ROM_LOAD( "ff-15.bin", 0x20000, 0x10000, CRC(6eada47c) SHA1(98fc4e93c47bc42ea7c20e8ac994b117cd7cb5a5) )
 	ROM_LOAD( "ff-14.bin", 0x30000, 0x10000, CRC(4ba7de4a) SHA1(bf552fa33746f3d27f9b193424a38fef58fe0765) )
 
-	ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* 6502 Sound CPU */
+	ROM_REGION( 0x10000, "audio", 0 ) /* 6502 Sound CPU */
 	ROM_LOAD( "ff-18.bin", 0x00000, 0x10000, CRC(9de9ee63) SHA1(c91b824b9a791cb90365d45c8e1b69e67f7d065f) )
 
-	ROM_REGION( 0x20000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE )
+	ROM_REGION( 0x20000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "ff-12.bin", 0x00000, 0x10000, CRC(15fb49f2) SHA1(a81ff1dbc813ab9b37edb832e01aab9a9a3ed5a1) ) /* Chars */
 	ROM_LOAD( "ff-13.bin", 0x10000, 0x10000, CRC(e20c9623) SHA1(b5a58599a016378f34217396212f81ede9272598) )
 
-	ROM_REGION( 0x60000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE )
+	ROM_REGION( 0x60000, "gfx2", ROMREGION_DISPOSE )
 	ROM_LOAD( "ff-11.bin", 0x00000, 0x10000, CRC(19e885c7) SHA1(694f0aa4c1c976320d985ee50bb59c1894b853ed) ) /* Sprites */
 	ROM_LOAD( "ff-10.bin", 0x10000, 0x08000, CRC(4b6b477a) SHA1(77486e0ff957cbfdae16d2b5977e95b7a7ced948) )
 	ROM_LOAD( "ff-09.bin", 0x18000, 0x10000, CRC(79c6bc0e) SHA1(d4bf195f6114103d2eb68f3aaf65d4044947f600) )
@@ -532,13 +532,13 @@ ROM_START( triothej )
 	ROM_LOAD( "ff-01.bin", 0x48000, 0x10000, CRC(68d80a66) SHA1(526ed8c920915877f5ee0519c9c8eee7e5580c54) )
 	ROM_LOAD( "ff-00.bin", 0x58000, 0x08000, CRC(41232442) SHA1(1c10a4f5607e41d6239cb478ed7355963ad6b2d0) )
 
-	ROM_REGION( 0x40000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE )
+	ROM_REGION( 0x40000, "gfx3", ROMREGION_DISPOSE )
 	ROM_LOAD( "ff-04.bin", 0x00000, 0x10000, CRC(7cea3c87) SHA1(b58156140a75f88ee6ec97ca7cdc02619ec51726) ) /* Tiles */
 	ROM_LOAD( "ff-06.bin", 0x10000, 0x10000, CRC(5e7f3e8f) SHA1(c92ec281b3985b442957f7d9237eb38a6d621cd4) )
 	ROM_LOAD( "ff-05.bin", 0x20000, 0x10000, CRC(8bb13f05) SHA1(f524cb0a38d0025c93124fc329d913e000155e9b) )
 	ROM_LOAD( "ff-07.bin", 0x30000, 0x10000, CRC(0d7affc3) SHA1(59f9fbf13216aaf67c7d1ad3a11a1738c4afd9e5) )
 
-	ROM_REGION( 0x10000, RGNCLASS_SOUND, "oki", 0 ) /* ADPCM sounds */
+	ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
 	ROM_LOAD( "ff-17.bin", 0x00000, 0x10000, CRC(f0ab0d05) SHA1(29d3ab513a8d46a1cb70f5333fa56bb787a58288) )
 ROM_END