summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author etabeta78 <etabeta78@users.noreply.github.com>2014-12-11 14:30:57 +0100
committer etabeta78 <etabeta78@users.noreply.github.com>2014-12-11 14:30:57 +0100
commitd7e0e01987a50d9442e09ecbb7640f788bafaeb6 (patch)
tree63d81c007ea94390b2d341969999507fd327f74e
parent112d83bd5b9a119d07ee5cff2a875791463c3a06 (diff)
renamed the disk formats, since I cannot exclude some of them are used
also for x68000 disks... nw.
-rw-r--r--hash/vsmile_cart.xml2
-rw-r--r--src/lib/formats/dcp_dsk.c (renamed from src/lib/formats/pc98dcp_dsk.c)24
-rw-r--r--src/lib/formats/dcp_dsk.h (renamed from src/lib/formats/pc98dcp_dsk.h)12
-rw-r--r--src/lib/formats/dip_dsk.c (renamed from src/lib/formats/pc98dip_dsk.c)26
-rw-r--r--src/lib/formats/dip_dsk.h (renamed from src/lib/formats/pc98dip_dsk.h)14
-rw-r--r--src/lib/formats/fdd_dsk.c (renamed from src/lib/formats/pc98fdd_dsk.c)26
-rw-r--r--src/lib/formats/fdd_dsk.h (renamed from src/lib/formats/pc98fdd_dsk.h)16
-rw-r--r--src/lib/formats/nfd_dsk.c (renamed from src/lib/formats/pc98nfd_dsk.c)26
-rw-r--r--src/lib/formats/nfd_dsk.h (renamed from src/lib/formats/pc98nfd_dsk.h)16
-rw-r--r--src/lib/lib.mak8
-rw-r--r--src/mess/drivers/pc9801.c16
11 files changed, 93 insertions, 93 deletions
diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml
index 63521b95201..bf3c5d17025 100644
--- a/hash/vsmile_cart.xml
+++ b/hash/vsmile_cart.xml
@@ -1168,7 +1168,7 @@ V.Smile Smartbooks
</part>
</software>
- <software name="spiderman" supported="no">
+ <software name="spidermn" supported="no">
<description>Spider-Man &amp; Freunde - Wettkampf im Space-Labor (Ger)</description>
<year>200?</year>
<publisher>VTech</publisher>
diff --git a/src/lib/formats/pc98dcp_dsk.c b/src/lib/formats/dcp_dsk.c
index efbb5063512..7d0c854f5ed 100644
--- a/src/lib/formats/pc98dcp_dsk.c
+++ b/src/lib/formats/dcp_dsk.c
@@ -2,7 +2,7 @@
// copyright-holders:etabeta
/*********************************************************************
- formats/pc98dcp_dsk.h
+ formats/dcp_dsk.h
PC98 DCP & DCU disk images
@@ -21,28 +21,28 @@
*********************************************************************/
#include "emu.h"
-#include "pc98dcp_dsk.h"
+#include "dcp_dsk.h"
-pc98dcp_format::pc98dcp_format()
+dcp_format::dcp_format()
{
}
-const char *pc98dcp_format::name() const
+const char *dcp_format::name() const
{
- return "pc98_dcx";
+ return "dcx";
}
-const char *pc98dcp_format::description() const
+const char *dcp_format::description() const
{
- return "PC98 DCP/DCU disk image";
+ return "DCP/DCU disk image";
}
-const char *pc98dcp_format::extensions() const
+const char *dcp_format::extensions() const
{
return "dcp,dcu";
}
-int pc98dcp_format::identify(io_generic *io, UINT32 form_factor)
+int dcp_format::identify(io_generic *io, UINT32 form_factor)
{
UINT64 size = io_generic_size(io);
UINT8 h[0xa2];
@@ -111,7 +111,7 @@ int pc98dcp_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
-bool pc98dcp_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool dcp_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
UINT8 h[0xa2];
int heads, tracks, spt, bps;
@@ -293,9 +293,9 @@ bool pc98dcp_format::load(io_generic *io, UINT32 form_factor, floppy_image *imag
return true;
}
-bool pc98dcp_format::supports_save() const
+bool dcp_format::supports_save() const
{
return false;
}
-const floppy_format_type FLOPPY_PC98DCP_FORMAT = &floppy_image_format_creator<pc98dcp_format>;
+const floppy_format_type FLOPPY_DCP_FORMAT = &floppy_image_format_creator<dcp_format>;
diff --git a/src/lib/formats/pc98dcp_dsk.h b/src/lib/formats/dcp_dsk.h
index 295c9b3d54c..4a5df0cbe73 100644
--- a/src/lib/formats/pc98dcp_dsk.h
+++ b/src/lib/formats/dcp_dsk.h
@@ -1,21 +1,21 @@
/*********************************************************************
- formats/pc98dcp_dsk.h
+ formats/dcp_dsk.h
PC98 DCP & DCU disk images
*********************************************************************/
-#ifndef PC98DCP_DSK_H
-#define PC98DCP_DSK_H
+#ifndef DCP_DSK_H
+#define DCP_DSK_H
#include "flopimg.h"
-class pc98dcp_format : public floppy_image_format_t
+class dcp_format : public floppy_image_format_t
{
public:
- pc98dcp_format();
+ dcp_format();
virtual int identify(io_generic *io, UINT32 form_factor);
virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
@@ -26,6 +26,6 @@ public:
virtual bool supports_save() const;
};
-extern const floppy_format_type FLOPPY_PC98DCP_FORMAT;
+extern const floppy_format_type FLOPPY_DCP_FORMAT;
#endif /* PC98DCP_DSK_H */
diff --git a/src/lib/formats/pc98dip_dsk.c b/src/lib/formats/dip_dsk.c
index bc10820f1d3..a245a69d824 100644
--- a/src/lib/formats/pc98dip_dsk.c
+++ b/src/lib/formats/dip_dsk.c
@@ -2,9 +2,9 @@
// copyright-holders:etabeta
/*********************************************************************
- formats/pc98dip_dsk.h
+ formats/dip_dsk.h
- PC98DIP disk images
+ PC98 DIP disk images
0x100 header, followed by track data
@@ -15,28 +15,28 @@
*********************************************************************/
#include "emu.h"
-#include "pc98dip_dsk.h"
+#include "dip_dsk.h"
-pc98dip_format::pc98dip_format()
+dip_format::dip_format()
{
}
-const char *pc98dip_format::name() const
+const char *dip_format::name() const
{
- return "pc98_dip";
+ return "dip";
}
-const char *pc98dip_format::description() const
+const char *dip_format::description() const
{
- return "PC98 DIP disk image";
+ return "DIP disk image";
}
-const char *pc98dip_format::extensions() const
+const char *dip_format::extensions() const
{
return "dip";
}
-int pc98dip_format::identify(io_generic *io, UINT32 form_factor)
+int dip_format::identify(io_generic *io, UINT32 form_factor)
{
UINT64 size = io_generic_size(io);
@@ -46,7 +46,7 @@ int pc98dip_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
-bool pc98dip_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool dip_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
int heads, tracks, spt, bps;
@@ -88,9 +88,9 @@ bool pc98dip_format::load(io_generic *io, UINT32 form_factor, floppy_image *imag
return true;
}
-bool pc98dip_format::supports_save() const
+bool dip_format::supports_save() const
{
return false;
}
-const floppy_format_type FLOPPY_PC98DIP_FORMAT = &floppy_image_format_creator<pc98dip_format>;
+const floppy_format_type FLOPPY_DIP_FORMAT = &floppy_image_format_creator<dip_format>;
diff --git a/src/lib/formats/pc98dip_dsk.h b/src/lib/formats/dip_dsk.h
index 4e1a7f7ba0e..761d70363e8 100644
--- a/src/lib/formats/pc98dip_dsk.h
+++ b/src/lib/formats/dip_dsk.h
@@ -1,21 +1,21 @@
/*********************************************************************
- formats/pc98dip_dsk.h
+ formats/dip_dsk.h
PC98DIP disk images
*********************************************************************/
-#ifndef PC98DIP_DSK_H
-#define PC98DIP_DSK_H
+#ifndef DIP_DSK_H
+#define DIP_DSK_H
#include "flopimg.h"
-class pc98dip_format : public floppy_image_format_t
+class dip_format : public floppy_image_format_t
{
public:
- pc98dip_format();
+ dip_format();
virtual int identify(io_generic *io, UINT32 form_factor);
virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
@@ -26,6 +26,6 @@ public:
virtual bool supports_save() const;
};
-extern const floppy_format_type FLOPPY_PC98DIP_FORMAT;
+extern const floppy_format_type FLOPPY_DIP_FORMAT;
-#endif /* PC98DIP_DSK_H */
+#endif /* DIP_DSK_H */
diff --git a/src/lib/formats/pc98fdd_dsk.c b/src/lib/formats/fdd_dsk.c
index 86389125d05..9390449add2 100644
--- a/src/lib/formats/pc98fdd_dsk.c
+++ b/src/lib/formats/fdd_dsk.c
@@ -2,9 +2,9 @@
// copyright-holders:etabeta
/*********************************************************************
- formats/pc98fdd_dsk.h
+ formats/fdd_dsk.h
- PC98FDD disk images
+ PC98 FDD disk images
0xC3FC header, followed by track data
Sector map starts at offset 0xDC, with 12bytes for each sector
@@ -32,28 +32,28 @@
*********************************************************************/
#include "emu.h"
-#include "pc98fdd_dsk.h"
+#include "fdd_dsk.h"
-pc98fdd_format::pc98fdd_format()
+fdd_format::fdd_format()
{
}
-const char *pc98fdd_format::name() const
+const char *fdd_format::name() const
{
- return "pc98_fdd";
+ return "fdd";
}
-const char *pc98fdd_format::description() const
+const char *fdd_format::description() const
{
- return "PC98 FDD disk image";
+ return "FDD disk image";
}
-const char *pc98fdd_format::extensions() const
+const char *fdd_format::extensions() const
{
return "fdd";
}
-int pc98fdd_format::identify(io_generic *io, UINT32 form_factor)
+int fdd_format::identify(io_generic *io, UINT32 form_factor)
{
UINT8 h[7];
io_generic_read(io, h, 0, 7);
@@ -64,7 +64,7 @@ int pc98fdd_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
-bool pc98fdd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool fdd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
UINT8 hsec[0x0c];
@@ -141,9 +141,9 @@ bool pc98fdd_format::load(io_generic *io, UINT32 form_factor, floppy_image *imag
return true;
}
-bool pc98fdd_format::supports_save() const
+bool fdd_format::supports_save() const
{
return false;
}
-const floppy_format_type FLOPPY_PC98FDD_FORMAT = &floppy_image_format_creator<pc98fdd_format>;
+const floppy_format_type FLOPPY_FDD_FORMAT = &floppy_image_format_creator<fdd_format>;
diff --git a/src/lib/formats/pc98fdd_dsk.h b/src/lib/formats/fdd_dsk.h
index 4540b822093..8fd7a7ff878 100644
--- a/src/lib/formats/pc98fdd_dsk.h
+++ b/src/lib/formats/fdd_dsk.h
@@ -1,21 +1,21 @@
/*********************************************************************
- formats/pc98fdd_dsk.h
+ formats/fdd_dsk.h
- PC98FDD disk images
+ PC98 FDD disk images
*********************************************************************/
-#ifndef PC98FDD_DSK_H
-#define PC98FDD_DSK_H
+#ifndef FDD_DSK_H
+#define FDD_DSK_H
#include "flopimg.h"
-class pc98fdd_format : public floppy_image_format_t
+class fdd_format : public floppy_image_format_t
{
public:
- pc98fdd_format();
+ fdd_format();
virtual int identify(io_generic *io, UINT32 form_factor);
virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
@@ -26,6 +26,6 @@ public:
virtual bool supports_save() const;
};
-extern const floppy_format_type FLOPPY_PC98FDD_FORMAT;
+extern const floppy_format_type FLOPPY_FDD_FORMAT;
-#endif /* PC98FDD_DSK_H */
+#endif /* FDD_DSK_H */
diff --git a/src/lib/formats/pc98nfd_dsk.c b/src/lib/formats/nfd_dsk.c
index ab032ec4b3d..7f55e22dd45 100644
--- a/src/lib/formats/pc98nfd_dsk.c
+++ b/src/lib/formats/nfd_dsk.c
@@ -2,9 +2,9 @@
// copyright-holders:etabeta
/*********************************************************************
- formats/pc98nfd_dsk.h
+ formats/nfd_dsk.h
- PC98NFD disk images (info from: http://www.geocities.jp/t98next/dev.html )
+ PC98 NFD disk images (info from: http://www.geocities.jp/t98next/dev.html )
Revision 0
==========
@@ -78,28 +78,28 @@
*********************************************************************/
#include "emu.h"
-#include "pc98nfd_dsk.h"
+#include "nfd_dsk.h"
-pc98nfd_format::pc98nfd_format()
+nfd_format::nfd_format()
{
}
-const char *pc98nfd_format::name() const
+const char *nfd_format::name() const
{
- return "pc98_nfd";
+ return "nfd";
}
-const char *pc98nfd_format::description() const
+const char *nfd_format::description() const
{
- return "PC98 NFD disk image";
+ return "NFD disk image";
}
-const char *pc98nfd_format::extensions() const
+const char *nfd_format::extensions() const
{
return "nfd";
}
-int pc98nfd_format::identify(io_generic *io, UINT32 form_factor)
+int nfd_format::identify(io_generic *io, UINT32 form_factor)
{
UINT8 h[16];
io_generic_read(io, h, 0, 16);
@@ -110,7 +110,7 @@ int pc98nfd_format::identify(io_generic *io, UINT32 form_factor)
return 0;
}
-bool pc98nfd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
+bool nfd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
UINT64 size = io_generic_size(io);
UINT8 h[0x120], hsec[0x10];
@@ -273,9 +273,9 @@ bool pc98nfd_format::load(io_generic *io, UINT32 form_factor, floppy_image *imag
return true;
}
-bool pc98nfd_format::supports_save() const
+bool nfd_format::supports_save() const
{
return false;
}
-const floppy_format_type FLOPPY_PC98NFD_FORMAT = &floppy_image_format_creator<pc98nfd_format>;
+const floppy_format_type FLOPPY_NFD_FORMAT = &floppy_image_format_creator<nfd_format>;
diff --git a/src/lib/formats/pc98nfd_dsk.h b/src/lib/formats/nfd_dsk.h
index e3d3270e1c9..820d6a573b2 100644
--- a/src/lib/formats/pc98nfd_dsk.h
+++ b/src/lib/formats/nfd_dsk.h
@@ -1,21 +1,21 @@
/*********************************************************************
- formats/pc98nfd_dsk.h
+ formats/nfd_dsk.h
- PC98NFD disk images
+ PC98 NFD disk images
*********************************************************************/
-#ifndef PC98NFD_DSK_H
-#define PC98NFD_DSK_H
+#ifndef NFD_DSK_H
+#define NFD_DSK_H
#include "flopimg.h"
-class pc98nfd_format : public floppy_image_format_t
+class nfd_format : public floppy_image_format_t
{
public:
- pc98nfd_format();
+ nfd_format();
virtual int identify(io_generic *io, UINT32 form_factor);
virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
@@ -26,6 +26,6 @@ public:
virtual bool supports_save() const;
};
-extern const floppy_format_type FLOPPY_PC98NFD_FORMAT;
+extern const floppy_format_type FLOPPY_NFD_FORMAT;
-#endif /* PC98NFD_DSK_H */
+#endif /* NFD_DSK_H */
diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index 443929ce648..34ba901389d 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -138,8 +138,10 @@ FORMATSOBJS = \
$(LIBOBJ)/formats/d81_dsk.o \
$(LIBOBJ)/formats/d82_dsk.o \
$(LIBOBJ)/formats/d88_dsk.o \
+ $(LIBOBJ)/formats/dcp_dsk.o \
$(LIBOBJ)/formats/dfi_dsk.o \
$(LIBOBJ)/formats/dim_dsk.o \
+ $(LIBOBJ)/formats/dip_dsk.o \
$(LIBOBJ)/formats/dmk_dsk.o \
$(LIBOBJ)/formats/dmv_dsk.o \
$(LIBOBJ)/formats/dsk_dsk.o \
@@ -148,6 +150,7 @@ FORMATSOBJS = \
$(LIBOBJ)/formats/esq16_dsk.o \
$(LIBOBJ)/formats/fc100_cas.o \
$(LIBOBJ)/formats/fdi_dsk.o \
+ $(LIBOBJ)/formats/fdd_dsk.o \
$(LIBOBJ)/formats/flex_dsk.o \
$(LIBOBJ)/formats/fm7_cas.o \
$(LIBOBJ)/formats/fmsx_cas.o \
@@ -175,6 +178,7 @@ FORMATSOBJS = \
$(LIBOBJ)/formats/nanos_dsk.o \
$(LIBOBJ)/formats/naslite_dsk.o \
$(LIBOBJ)/formats/nes_dsk.o \
+ $(LIBOBJ)/formats/nfd_dsk.o \
$(LIBOBJ)/formats/orao_cas.o \
$(LIBOBJ)/formats/oric_dsk.o \
$(LIBOBJ)/formats/oric_tap.o \
@@ -183,10 +187,6 @@ FORMATSOBJS = \
$(LIBOBJ)/formats/pc_dsk.o \
$(LIBOBJ)/formats/pc98_dsk.o \
$(LIBOBJ)/formats/pc98fdi_dsk.o \
- $(LIBOBJ)/formats/pc98fdd_dsk.o \
- $(LIBOBJ)/formats/pc98dcp_dsk.o \
- $(LIBOBJ)/formats/pc98dip_dsk.o \
- $(LIBOBJ)/formats/pc98nfd_dsk.o \
$(LIBOBJ)/formats/phc25_cas.o \
$(LIBOBJ)/formats/pmd_cas.o \
$(LIBOBJ)/formats/primoptp.o \
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index 12605563113..f7de354792e 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -416,10 +416,10 @@ Keyboard TX commands:
#include "formats/pc98_dsk.h"
#include "formats/pc98fdi_dsk.h"
-#include "formats/pc98fdd_dsk.h"
-#include "formats/pc98dcp_dsk.h"
-#include "formats/pc98dip_dsk.h"
-#include "formats/pc98nfd_dsk.h"
+#include "formats/fdd_dsk.h"
+#include "formats/dcp_dsk.h"
+#include "formats/dip_dsk.h"
+#include "formats/nfd_dsk.h"
#include "machine/pc9801_26.h"
#include "machine/pc9801_86.h"
@@ -3100,10 +3100,10 @@ INTERRUPT_GEN_MEMBER(pc9801_state::pc9801_vrtc_irq)
FLOPPY_FORMATS_MEMBER( pc9801_state::floppy_formats )
FLOPPY_PC98_FORMAT,
FLOPPY_PC98FDI_FORMAT,
- FLOPPY_PC98FDD_FORMAT,
- FLOPPY_PC98DCP_FORMAT,
- FLOPPY_PC98DIP_FORMAT,
- FLOPPY_PC98NFD_FORMAT
+ FLOPPY_FDD_FORMAT,
+ FLOPPY_DCP_FORMAT,
+ FLOPPY_DIP_FORMAT,
+ FLOPPY_NFD_FORMAT
FLOPPY_FORMATS_END
TIMER_DEVICE_CALLBACK_MEMBER( pc9801_state::mouse_irq_cb )