diff --git a/hash/vboy.xml b/hash/vboy.xml
index d5522c143c6..a55ec0442e4 100644
--- a/hash/vboy.xml
+++ b/hash/vboy.xml
@@ -65,11 +65,12 @@ According to Planet Virtual Boy, the following undumped protos exist
Nintendo
-
+
+
@@ -278,12 +279,13 @@ According to Planet Virtual Boy, the following undumped protos exist
Nintendo
-
+
+
@@ -326,12 +328,13 @@ According to Planet Virtual Boy, the following undumped protos exist
Pack-In-Video
-
+
+
@@ -372,11 +375,12 @@ According to Planet Virtual Boy, the following undumped protos exist
T&E Soft
-
+
+
@@ -449,11 +453,12 @@ According to Planet Virtual Boy, the following undumped protos exist
Nintendo
-
+
+
@@ -464,7 +469,6 @@ According to Planet Virtual Boy, the following undumped protos exist
Ocean
-
diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c
index e3961d84b7e..4f504261282 100644
--- a/src/mess/drivers/vboy.c
+++ b/src/mess/drivers/vboy.c
@@ -1334,12 +1334,6 @@ static GFXDECODE_START( vboy )
GFXDECODE_ENTRY( "pcg", 0x00000, vboy_pcg_8x8, 0, 1 )
GFXDECODE_END
-struct vboy_pcb
-{
- const char *pcb_name;
- int pcb_id;
-};
-
READ32_MEMBER(vboy_state::sram_r)
{
return m_vboy_sram[offset];
@@ -1350,29 +1344,6 @@ WRITE32_MEMBER(vboy_state::sram_w)
COMBINE_DATA(&m_vboy_sram[offset]);
}
-#define VBOY_CHIP_NONE 0
-#define VBOY_CHIP_SRAM 1
-
-static const vboy_pcb pcb_list[] =
-{
- {"No", VBOY_CHIP_NONE},
- {"Yes", VBOY_CHIP_SRAM}
-};
-
-
-static int vboy_get_pcb_id(const char *pcb)
-{
- int i;
-
- for (i = 0; i < ARRAY_LENGTH(pcb_list); i++)
- {
- if (!mame_stricmp(pcb_list[i].pcb_name, pcb))
- return pcb_list[i].pcb_id;
- }
-
- return 0;
-}
-
static DEVICE_IMAGE_LOAD( vboy_cart )
{
@@ -1389,19 +1360,15 @@ static DEVICE_IMAGE_LOAD( vboy_cart )
}
else
{
- const char *pcb_name;
cart_size = image.get_software_region_length("rom");
memcpy(ROM, image.get_software_region("rom"), cart_size);
- pcb_name = image.get_feature("eeprom");
- if (pcb_name == NULL)
- chip = 0;
- else
- chip = vboy_get_pcb_id(pcb_name);
-
+ UINT8 *tmp_eeprom = image.get_software_region("eeprom");
+ if (tmp_eeprom)
+ chip = 1;
}
- if(chip & VBOY_CHIP_SRAM)
+ if (chip)
{
state->m_nvptr = (UINT8 *)&state->m_vboy_sram;