summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/target/mame/mame.lua51
-rw-r--r--src/mame/arcade.flt24
-rw-r--r--src/mame/chess/README.md3
-rw-r--r--src/mame/chess/ave_arb.cpp (renamed from src/mame/misc_chess/ave_arb.cpp)0
-rw-r--r--src/mame/chess/cking_master.cpp (renamed from src/mame/misc_chess/cking_master.cpp)0
-rw-r--r--src/mame/chess/compuchess.cpp (renamed from src/mame/misc_chess/compuchess.cpp)0
-rw-r--r--src/mame/chess/conchess.cpp (renamed from src/mame/misc_chess/conchess.cpp)0
-rw-r--r--src/mame/chess/conic_cchess2.cpp (renamed from src/mame/misc_chess/conic_cchess2.cpp)0
-rw-r--r--src/mame/chess/conic_cchess3.cpp (renamed from src/mame/misc_chess/conic_cchess3.cpp)0
-rw-r--r--src/mame/chess/regence.cpp (renamed from src/mame/misc_chess/regence.cpp)0
-rw-r--r--src/mame/chess/tasc.cpp (renamed from src/mame/misc_chess/tasc.cpp)0
-rw-r--r--src/mame/handheld/README.md4
-rw-r--r--src/mame/handheld/hh_cop400.cpp (renamed from src/mame/misc_handheld/hh_cop400.cpp)0
-rw-r--r--src/mame/handheld/hh_cops1.cpp (renamed from src/mame/misc_handheld/hh_cops1.cpp)0
-rw-r--r--src/mame/handheld/hh_hmcs40.cpp (renamed from src/mame/misc_handheld/hh_hmcs40.cpp)0
-rw-r--r--src/mame/handheld/hh_melps4.cpp (renamed from src/mame/misc_handheld/hh_melps4.cpp)0
-rw-r--r--src/mame/handheld/hh_pic16.cpp (renamed from src/mame/misc_handheld/hh_pic16.cpp)0
-rw-r--r--src/mame/handheld/hh_pps41.cpp (renamed from src/mame/misc_handheld/hh_pps41.cpp)0
-rw-r--r--src/mame/handheld/hh_rw5000.cpp (renamed from src/mame/misc_handheld/hh_rw5000.cpp)0
-rw-r--r--src/mame/handheld/hh_sm510.cpp (renamed from src/mame/misc_handheld/hh_sm510.cpp)0
-rw-r--r--src/mame/handheld/hh_sm510.h (renamed from src/mame/misc_handheld/hh_sm510.h)0
-rw-r--r--src/mame/handheld/hh_tms1k.cpp (renamed from src/mame/misc_handheld/hh_tms1k.cpp)0
-rw-r--r--src/mame/handheld/hh_tms1k.h (renamed from src/mame/misc_handheld/hh_tms1k.h)0
-rw-r--r--src/mame/handheld/hh_ucom4.cpp (renamed from src/mame/misc_handheld/hh_ucom4.cpp)0
-rw-r--r--src/mame/handheld/monty.cpp (renamed from src/mame/misc_handheld/monty.cpp)0
-rw-r--r--src/mame/handheld/rzone.cpp (renamed from src/mame/misc_handheld/rzone.cpp)0
-rw-r--r--src/mame/handheld/scrablex.cpp (renamed from src/mame/misc_handheld/scrablex.cpp)0
-rw-r--r--src/mame/handheld/talkingbb.cpp (renamed from src/mame/misc_handheld/talkingbb.cpp)0
-rw-r--r--src/mame/handheld/talkingfb.cpp (renamed from src/mame/misc_handheld/talkingfb.cpp)0
-rw-r--r--src/mame/handheld/tispeak.cpp (renamed from src/mame/misc_handheld/tispeak.cpp)0
-rw-r--r--src/mame/handheld/tispellb.cpp (renamed from src/mame/misc_handheld/tispellb.cpp)0
-rw-r--r--src/mame/handheld/wildfire.cpp (renamed from src/mame/misc_handheld/wildfire.cpp)0
-rw-r--r--src/mame/mame.lst90
-rw-r--r--src/mame/mess.flt72
-rw-r--r--src/mame/misc_chess/README.md3
-rw-r--r--src/mame/misc_handheld/README.md4
-rw-r--r--src/mame/pc/README.md3
-rw-r--r--src/mame/pc/at.cpp (renamed from src/mame/at/at.cpp)0
-rw-r--r--src/mame/pc/atpci.cpp (renamed from src/mame/at/atpci.cpp)0
-rw-r--r--src/mame/pc/calchase.cpp (renamed from src/mame/ibmpc/calchase.cpp)0
-rw-r--r--src/mame/pc/ct486.cpp (renamed from src/mame/at/ct486.cpp)0
-rw-r--r--src/mame/pc/ec184x.cpp (renamed from src/mame/xussrpc/ec184x.cpp)0
-rw-r--r--src/mame/pc/fruitpc.cpp (renamed from src/mame/ibmpc/fruitpc.cpp)0
-rw-r--r--src/mame/pc/igspc.cpp (renamed from src/mame/ibmpc/igspc.cpp)0
-rw-r--r--src/mame/pc/iskr103x.cpp (renamed from src/mame/xussrpc/iskr103x.cpp)0
-rw-r--r--src/mame/pc/kb_7007_3.h (renamed from src/mame/xussrpc/kb_7007_3.h)0
-rw-r--r--src/mame/pc/kb_poisk1.h (renamed from src/mame/xussrpc/kb_poisk1.h)0
-rw-r--r--src/mame/pc/mc1502.cpp (renamed from src/mame/xussrpc/mc1502.cpp)0
-rw-r--r--src/mame/pc/pangofun.cpp (renamed from src/mame/ibmpc/pangofun.cpp)0
-rw-r--r--src/mame/pc/paokaipc.cpp (renamed from src/mame/ibmpc/paokaipc.cpp)0
-rw-r--r--src/mame/pc/pcat_dyn.cpp (renamed from src/mame/ibmpc/pcat_dyn.cpp)0
-rw-r--r--src/mame/pc/pcat_nit.cpp (renamed from src/mame/ibmpc/pcat_nit.cpp)0
-rw-r--r--src/mame/pc/pcxt.cpp (renamed from src/mame/ibmpc/pcxt.cpp)0
-rw-r--r--src/mame/pc/poisk1.cpp (renamed from src/mame/xussrpc/poisk1.cpp)0
-rw-r--r--src/mame/pc/ps2.cpp (renamed from src/mame/at/ps2.cpp)0
-rw-r--r--src/mame/pc/quakeat.cpp (renamed from src/mame/ibmpc/quakeat.cpp)0
-rw-r--r--src/mame/pc/queen.cpp (renamed from src/mame/ibmpc/queen.cpp)0
-rw-r--r--src/mame/pc/sis630.cpp (renamed from src/mame/ibmpc/sis630.cpp)0
58 files changed, 119 insertions, 135 deletions
diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index 01e621be1f6..d099c0e4036 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -1269,7 +1269,6 @@ function linkProjects_mame_mame(_target, _subtarget)
"appliedtech",
"arcadia",
"aristocr",
- "at",
"atari",
"atlus",
"att",
@@ -1290,6 +1289,7 @@ function linkProjects_mame_mame(_target, _subtarget)
"cantab",
"capcom",
"casio",
+ "chess",
"commodore",
"cce",
"ccs",
@@ -1356,6 +1356,7 @@ function linkProjects_mame_mame(_target, _subtarget)
"gridcomp",
"grundy",
"h01x",
+ "handheld",
"hartung",
"hds",
"heathkit",
@@ -1368,7 +1369,6 @@ function linkProjects_mame_mame(_target, _subtarget)
"hp",
"husky",
"ibm6580",
- "ibmpc",
"ie15",
"igs",
"igt",
@@ -1420,8 +1420,6 @@ function linkProjects_mame_mame(_target, _subtarget)
"miltonbradley",
"mips",
"misc",
- "misc_chess",
- "misc_handheld",
"mit",
"mits",
"mitsubishi",
@@ -1581,7 +1579,6 @@ function linkProjects_mame_mame(_target, _subtarget)
"wing",
"wyse",
"xerox",
- "xussrpc",
"yamaha",
"yunsung",
"zaccaria",
@@ -1769,11 +1766,6 @@ files {
MAME_DIR .. "src/mame/aristocr/*.cpp",
}
-createMAMEProjects(_target, _subtarget, "at")
-files {
- MAME_DIR .. "src/mame/at/*.cpp",
-}
-
createMAMEProjects(_target, _subtarget, "atari")
files {
MAME_DIR .. "src/mame/atari/*.cpp",
@@ -2334,11 +2326,6 @@ files {
MAME_DIR .. "src/mame/ibm6580/*.h",
}
-createMAMEProjects(_target, _subtarget, "ibmpc")
-files {
- MAME_DIR .. "src/mame/ibmpc/*.cpp",
-}
-
createMAMEProjects(_target, _subtarget, "ie15")
files {
MAME_DIR .. "src/mame/ie15/*.cpp",
@@ -2860,12 +2847,6 @@ files {
MAME_DIR .. "src/mame/palm/*.ipp",
}
-createMAMEProjects(_target, _subtarget, "pc")
-files {
- MAME_DIR .. "src/mame/pc/*.cpp",
- MAME_DIR .. "src/mame/pc/*.h",
-}
-
createMAMEProjects(_target, _subtarget, "pce")
files {
MAME_DIR .. "src/mame/pce/*.cpp",
@@ -3505,12 +3486,6 @@ files {
MAME_DIR .. "src/mame/xerox/*.h",
}
-createMAMEProjects(_target, _subtarget, "xussrpc")
-files {
- MAME_DIR .. "src/mame/xussrpc/*.cpp",
- MAME_DIR .. "src/mame/xussrpc/*.h",
-}
-
createMAMEProjects(_target, _subtarget, "yamaha")
files {
MAME_DIR .. "src/mame/yamaha/*.cpp",
@@ -3560,21 +3535,27 @@ files {
-- remaining drivers
--------------------------------------------------
-createMAMEProjects(_target, _subtarget, "misc")
+createMAMEProjects(_target, _subtarget, "chess")
files {
- MAME_DIR .. "src/mame/misc/*.cpp",
- MAME_DIR .. "src/mame/misc/*.h",
+ MAME_DIR .. "src/mame/chess/*.cpp",
}
-createMAMEProjects(_target, _subtarget, "misc_chess")
+createMAMEProjects(_target, _subtarget, "handheld")
files {
- MAME_DIR .. "src/mame/misc_chess/*.cpp",
+ MAME_DIR .. "src/mame/handheld/*.cpp",
+ MAME_DIR .. "src/mame/handheld/*.h",
}
-createMAMEProjects(_target, _subtarget, "misc_handheld")
+createMAMEProjects(_target, _subtarget, "misc")
files {
- MAME_DIR .. "src/mame/misc_handheld/*.cpp",
- MAME_DIR .. "src/mame/misc_handheld/*.h",
+ MAME_DIR .. "src/mame/misc/*.cpp",
+ MAME_DIR .. "src/mame/misc/*.h",
+}
+
+createMAMEProjects(_target, _subtarget, "pc")
+files {
+ MAME_DIR .. "src/mame/pc/*.cpp",
+ MAME_DIR .. "src/mame/pc/*.h",
}
createMAMEProjects(_target, _subtarget, "skeleton")
diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt
index 59934c2b53b..8576c6d50b4 100644
--- a/src/mame/arcade.flt
+++ b/src/mame/arcade.flt
@@ -345,17 +345,6 @@ gametron/gotya.cpp
gametron/sbugger.cpp
gottlieb/exterm.cpp
gottlieb/gottlieb.cpp
-ibmpc/calchase.cpp
-ibmpc/fruitpc.cpp
-ibmpc/igspc.cpp
-ibmpc/pangofun.cpp
-ibmpc/paokaipc.cpp
-ibmpc/pcat_dyn.cpp
-ibmpc/pcat_nit.cpp
-ibmpc/pcxt.cpp
-ibmpc/quakeat.cpp
-ibmpc/queen.cpp
-ibmpc/sis630.cpp
igs/cabaret.cpp
igs/dunhuang.cpp
igs/funtech.cpp
@@ -1065,6 +1054,17 @@ pacman/jrpacman.cpp
pacman/pacman.cpp
pacman/pengo.cpp
pacman/schick.cpp
+pc/calchase.cpp
+pc/fruitpc.cpp
+pc/igspc.cpp
+pc/pangofun.cpp
+pc/paokaipc.cpp
+pc/pcat_dyn.cpp
+pc/pcat_nit.cpp
+pc/pcxt.cpp
+pc/quakeat.cpp
+pc/queen.cpp
+pc/sis630.cpp
pce/ggconnie.cpp
pce/paranoia.cpp
pce/tourvis.cpp
@@ -1570,7 +1570,7 @@ zaccaria/zaccaria.cpp
-saturnkr
-vsaturn
-//ibmpc/sis630.cpp
+//pc/sis630.cpp
-shutms11
//miltonbradley/vectrex.cpp
diff --git a/src/mame/chess/README.md b/src/mame/chess/README.md
new file mode 100644
index 00000000000..bf53b940518
--- /dev/null
+++ b/src/mame/chess/README.md
@@ -0,0 +1,3 @@
+# **src/mame/chess** #
+
+Generic folder for chesscomputer drivers, where the number of drivers is too small to place them in specific company folders. \ No newline at end of file
diff --git a/src/mame/misc_chess/ave_arb.cpp b/src/mame/chess/ave_arb.cpp
index 0a15c61933c..0a15c61933c 100644
--- a/src/mame/misc_chess/ave_arb.cpp
+++ b/src/mame/chess/ave_arb.cpp
diff --git a/src/mame/misc_chess/cking_master.cpp b/src/mame/chess/cking_master.cpp
index 764d46bc4e3..764d46bc4e3 100644
--- a/src/mame/misc_chess/cking_master.cpp
+++ b/src/mame/chess/cking_master.cpp
diff --git a/src/mame/misc_chess/compuchess.cpp b/src/mame/chess/compuchess.cpp
index d22fec8e350..d22fec8e350 100644
--- a/src/mame/misc_chess/compuchess.cpp
+++ b/src/mame/chess/compuchess.cpp
diff --git a/src/mame/misc_chess/conchess.cpp b/src/mame/chess/conchess.cpp
index 5ec9a2db77f..5ec9a2db77f 100644
--- a/src/mame/misc_chess/conchess.cpp
+++ b/src/mame/chess/conchess.cpp
diff --git a/src/mame/misc_chess/conic_cchess2.cpp b/src/mame/chess/conic_cchess2.cpp
index f2613fee8a9..f2613fee8a9 100644
--- a/src/mame/misc_chess/conic_cchess2.cpp
+++ b/src/mame/chess/conic_cchess2.cpp
diff --git a/src/mame/misc_chess/conic_cchess3.cpp b/src/mame/chess/conic_cchess3.cpp
index f269e3472e9..f269e3472e9 100644
--- a/src/mame/misc_chess/conic_cchess3.cpp
+++ b/src/mame/chess/conic_cchess3.cpp
diff --git a/src/mame/misc_chess/regence.cpp b/src/mame/chess/regence.cpp
index d03f75fe4c0..d03f75fe4c0 100644
--- a/src/mame/misc_chess/regence.cpp
+++ b/src/mame/chess/regence.cpp
diff --git a/src/mame/misc_chess/tasc.cpp b/src/mame/chess/tasc.cpp
index e0e698396ee..e0e698396ee 100644
--- a/src/mame/misc_chess/tasc.cpp
+++ b/src/mame/chess/tasc.cpp
diff --git a/src/mame/handheld/README.md b/src/mame/handheld/README.md
new file mode 100644
index 00000000000..57b08ccc30b
--- /dev/null
+++ b/src/mame/handheld/README.md
@@ -0,0 +1,4 @@
+# **src/mame/handheld** #
+
+Generic folder for handheld/tabletop drivers, where the number of drivers is too small to place them in specific company folders.
+This also includes the hh_ collection drivers and their subclasses. \ No newline at end of file
diff --git a/src/mame/misc_handheld/hh_cop400.cpp b/src/mame/handheld/hh_cop400.cpp
index 587d1575207..587d1575207 100644
--- a/src/mame/misc_handheld/hh_cop400.cpp
+++ b/src/mame/handheld/hh_cop400.cpp
diff --git a/src/mame/misc_handheld/hh_cops1.cpp b/src/mame/handheld/hh_cops1.cpp
index 62134295653..62134295653 100644
--- a/src/mame/misc_handheld/hh_cops1.cpp
+++ b/src/mame/handheld/hh_cops1.cpp
diff --git a/src/mame/misc_handheld/hh_hmcs40.cpp b/src/mame/handheld/hh_hmcs40.cpp
index 347d603f2fb..347d603f2fb 100644
--- a/src/mame/misc_handheld/hh_hmcs40.cpp
+++ b/src/mame/handheld/hh_hmcs40.cpp
diff --git a/src/mame/misc_handheld/hh_melps4.cpp b/src/mame/handheld/hh_melps4.cpp
index 060ddba845b..060ddba845b 100644
--- a/src/mame/misc_handheld/hh_melps4.cpp
+++ b/src/mame/handheld/hh_melps4.cpp
diff --git a/src/mame/misc_handheld/hh_pic16.cpp b/src/mame/handheld/hh_pic16.cpp
index 3a35e746c8c..3a35e746c8c 100644
--- a/src/mame/misc_handheld/hh_pic16.cpp
+++ b/src/mame/handheld/hh_pic16.cpp
diff --git a/src/mame/misc_handheld/hh_pps41.cpp b/src/mame/handheld/hh_pps41.cpp
index 2521f355b0d..2521f355b0d 100644
--- a/src/mame/misc_handheld/hh_pps41.cpp
+++ b/src/mame/handheld/hh_pps41.cpp
diff --git a/src/mame/misc_handheld/hh_rw5000.cpp b/src/mame/handheld/hh_rw5000.cpp
index 0424ccad720..0424ccad720 100644
--- a/src/mame/misc_handheld/hh_rw5000.cpp
+++ b/src/mame/handheld/hh_rw5000.cpp
diff --git a/src/mame/misc_handheld/hh_sm510.cpp b/src/mame/handheld/hh_sm510.cpp
index 298bbdec48d..298bbdec48d 100644
--- a/src/mame/misc_handheld/hh_sm510.cpp
+++ b/src/mame/handheld/hh_sm510.cpp
diff --git a/src/mame/misc_handheld/hh_sm510.h b/src/mame/handheld/hh_sm510.h
index ad9041ae226..ad9041ae226 100644
--- a/src/mame/misc_handheld/hh_sm510.h
+++ b/src/mame/handheld/hh_sm510.h
diff --git a/src/mame/misc_handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp
index 4ad3d0b2c72..4ad3d0b2c72 100644
--- a/src/mame/misc_handheld/hh_tms1k.cpp
+++ b/src/mame/handheld/hh_tms1k.cpp
diff --git a/src/mame/misc_handheld/hh_tms1k.h b/src/mame/handheld/hh_tms1k.h
index 7d9904e4377..7d9904e4377 100644
--- a/src/mame/misc_handheld/hh_tms1k.h
+++ b/src/mame/handheld/hh_tms1k.h
diff --git a/src/mame/misc_handheld/hh_ucom4.cpp b/src/mame/handheld/hh_ucom4.cpp
index d270d5ce7c2..d270d5ce7c2 100644
--- a/src/mame/misc_handheld/hh_ucom4.cpp
+++ b/src/mame/handheld/hh_ucom4.cpp
diff --git a/src/mame/misc_handheld/monty.cpp b/src/mame/handheld/monty.cpp
index 8a2718a167a..8a2718a167a 100644
--- a/src/mame/misc_handheld/monty.cpp
+++ b/src/mame/handheld/monty.cpp
diff --git a/src/mame/misc_handheld/rzone.cpp b/src/mame/handheld/rzone.cpp
index abae24156fb..abae24156fb 100644
--- a/src/mame/misc_handheld/rzone.cpp
+++ b/src/mame/handheld/rzone.cpp
diff --git a/src/mame/misc_handheld/scrablex.cpp b/src/mame/handheld/scrablex.cpp
index 15b69e7f947..15b69e7f947 100644
--- a/src/mame/misc_handheld/scrablex.cpp
+++ b/src/mame/handheld/scrablex.cpp
diff --git a/src/mame/misc_handheld/talkingbb.cpp b/src/mame/handheld/talkingbb.cpp
index 1118559e70c..1118559e70c 100644
--- a/src/mame/misc_handheld/talkingbb.cpp
+++ b/src/mame/handheld/talkingbb.cpp
diff --git a/src/mame/misc_handheld/talkingfb.cpp b/src/mame/handheld/talkingfb.cpp
index 46dc83b6a00..46dc83b6a00 100644
--- a/src/mame/misc_handheld/talkingfb.cpp
+++ b/src/mame/handheld/talkingfb.cpp
diff --git a/src/mame/misc_handheld/tispeak.cpp b/src/mame/handheld/tispeak.cpp
index 667647474f1..667647474f1 100644
--- a/src/mame/misc_handheld/tispeak.cpp
+++ b/src/mame/handheld/tispeak.cpp
diff --git a/src/mame/misc_handheld/tispellb.cpp b/src/mame/handheld/tispellb.cpp
index 3826fcae96c..3826fcae96c 100644
--- a/src/mame/misc_handheld/tispellb.cpp
+++ b/src/mame/handheld/tispellb.cpp
diff --git a/src/mame/misc_handheld/wildfire.cpp b/src/mame/handheld/wildfire.cpp
index a680974da95..a680974da95 100644
--- a/src/mame/misc_handheld/wildfire.cpp
+++ b/src/mame/handheld/wildfire.cpp
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 8e932c45fe5..6f695e9fe58 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -2540,7 +2540,7 @@ galmedes // (c) 1992 Visco (Japan)
jigkmgri // B41 (c) 1988 Taito Corporation (Japan)
mofflott // C17 (c) 1989 Taito Corporation (Japan)
-@source:at/at.cpp
+@source:pc/at.cpp
asi100b0 // ASI 100B0, identified as "HAM 12 TI 286 Motherboard ZERO WAIT" ab hier 286
at // 1987 AMI Bios and Diagnostics
ataripc4 // Atari PC4 (286)
@@ -3161,7 +3161,7 @@ atom // 1979 Acorn Atom
atombb // 1982 Acorn Atom with BBC Basic
atomeb // 1979 Acorn Atom with Eprom Box
-@source:at/atpci.cpp
+@source:pc/atpci.cpp
at586 // 19?? AT 586
at586x3 // 19?? AT 586
m55hipl // 19?? Micronics M55HI-Plus
@@ -3242,7 +3242,7 @@ avalnche // 030574 1978/04 [6502]
cascade // bootleg
catchp // 008837 prototype 1977/?? [6502]
-@source:misc_chess/ave_arb.cpp
+@source:chess/ave_arb.cpp
arb //
arbv2 //
@@ -9947,7 +9947,7 @@ cabalus2 // (c) 1988 Tad + Fabtek license
@source:igs/cabaret.cpp
cabaret // (c) 1992 AMT
-@source:ibmpc/calchase.cpp
+@source:pc/calchase.cpp
calchase // (c) 1999 The Game Room
eggsplc // (c) 2002 The Game Room
hostinv // (c) 1998 The Game Room
@@ -10595,7 +10595,7 @@ citycon // (c) 1985 Jaleco
citycona // (c) 1985 Jaleco
cruisin // (c) 1985 Jaleco/Kitkorp
-@source:misc_chess/cking_master.cpp
+@source:chess/cking_master.cpp
ckmaster //
@source:alliedl/clayshoo.cpp
@@ -10783,7 +10783,7 @@ compgolfo // (c) 1985 Data East Corporation (Japan)
compis // 1985 Telenova Compis
compis2 // 1985 Telenova Compis
-@source:misc_chess/compuchess.cpp
+@source:chess/compuchess.cpp
ccmk1 // Chess Champion MK I
cmpchess
cmpchess2
@@ -10806,7 +10806,7 @@ comquest // Comquest Plus German
comx35n //
comx35p //
-@source:misc_chess/conchess.cpp
+@source:chess/conchess.cpp
concply5
concply8
concplyv
@@ -10815,10 +10815,10 @@ concstd
@source:concept/concept.cpp
concept // 1982 Corvus Concept
-@source:misc_chess/conic_cchess2.cpp
+@source:chess/conic_cchess2.cpp
cncchess2
-@source:misc_chess/conic_cchess3.cpp
+@source:chess/conic_cchess3.cpp
cncchess3
@source:skeleton/consola_emt.cpp
@@ -11645,7 +11645,7 @@ tsuwaku // (c) 2000
@source:namco/cswat.cpp
cswat // (c) 1984
-@source:at/ct486.cpp
+@source:pc/ct486.cpp
ct486 // 1993? 486 with CS4031
@source:skeleton/ct909e_segadvd.cpp
@@ -12895,7 +12895,7 @@ eacc //
@source:skeleton/easy_karaoke.cpp
easykara
-@source:xussrpc/ec184x.cpp
+@source:pc/ec184x.cpp
ec1840 //
ec1841 //
ec1845 //
@@ -14294,7 +14294,7 @@ natsuiro // [1989] Video System presents (Japan)
nekkyoku // [1988] Video System Co. (Japan)
nmsengen // (c) 1991 Video System (Japan)
-@source:ibmpc/fruitpc.cpp
+@source:pc/fruitpc.cpp
fruitpc // ???
@source:skeleton/fs3216.cpp
@@ -16485,7 +16485,7 @@ heromem // E34 (c) 1997 Taito
hexion // GX122 (c) 1992
hexionb // bootleg
-@source:misc_handheld/hh_cop400.cpp
+@source:handheld/hh_cop400.cpp
bship82 // Milton Bradley
copspa // National Semiconductor
ctstein // Castle Toy
@@ -16508,7 +16508,7 @@ solution // SCAT
unkeinv // Gordon Barlow Design
vidchal // Select Merchandise
-@source:misc_handheld/hh_cops1.cpp
+@source:handheld/hh_cops1.cpp
cambrp // Sinclair
mbaskb // Mattel
mhockey // Mattel
@@ -16517,7 +16517,7 @@ msoccer // Mattel
qkracerm // National Semiconductor
qkspeller // National Semiconductor
-@source:misc_handheld/hh_hmcs40.cpp
+@source:handheld/hh_hmcs40.cpp
alnattck // Coleco
bambball // Bambino
bbtime // Bandai
@@ -16560,11 +16560,11 @@ vinvader // VTech
wantgman // Actronics / Hanzawa
zackman // Bandai
-@source:misc_handheld/hh_melps4.cpp
+@source:handheld/hh_melps4.cpp
cfrogger // Coleco
gjungler // Gakken
-@source:misc_handheld/hh_pic16.cpp
+@source:handheld/hh_pic16.cpp
drdunk // Kmart
flash // Ideal
hccbaskb // Tiger Electronics
@@ -16580,7 +16580,7 @@ ttfballa // Toytronic
us2pfball // US Games
uspbball // US Games
-@source:misc_handheld/hh_pps41.cpp
+@source:handheld/hh_pps41.cpp
brainbaf // Mattel
dunksunk // Kmart
ftri1 // Fonas
@@ -16593,7 +16593,7 @@ rdqa // Selchow & Righter
scrabsen // Selchow & Righter
smastmind // Invicta
-@source:misc_handheld/hh_rw5000.cpp
+@source:handheld/hh_rw5000.cpp
autorace // Mattel
gravity // Mattel
mbaseb // Mattel
@@ -16606,7 +16606,7 @@ rw24k // Rockwell
rw30r // Rockwell
rw31r // Rockwell
-@source:misc_handheld/hh_sm510.cpp
+@source:handheld/hh_sm510.cpp
atakaast // Elektronika
auslalom // Elektronika
bassmate // Telko
@@ -16756,7 +16756,7 @@ txmenpx // Tiger
vespovar // Elektronika
vfutbol // Elektronika
-@source:misc_handheld/hh_tms1k.cpp
+@source:handheld/hh_tms1k.cpp
alphie // Playskool
arcmania // Milton Bradley
arrball // A-One LSI
@@ -16865,7 +16865,7 @@ wizatron // Texas Instruments
xl25 // Vulcan
zodiac // Coleco
-@source:misc_handheld/hh_ucom4.cpp
+@source:handheld/hh_ucom4.cpp
alnchase // Tomy
astrocmd // Epoch
bcclimbr // Bandai
@@ -17335,7 +17335,7 @@ tarzana // (c) 1999
tarzanc // (c) 1999
tjsb // (c) 1997
-@source:ibmpc/igspc.cpp
+@source:pc/igspc.cpp
eztouch // (c) 200?
speeddrv // (c) 2004
@@ -17543,7 +17543,7 @@ isbc8010b //
@source:intel/isbc8030.cpp
isbc8030 //
-@source:xussrpc/iskr103x.cpp
+@source:pc/iskr103x.cpp
iskr1030m //
iskr1031 //
@@ -22936,7 +22936,7 @@ mc10 // MC-10
@source:cce/mc1000.cpp
mc1000 //
-@source:xussrpc/mc1502.cpp
+@source:pc/mc1502.cpp
mc1502 //
pk88 //
@@ -24276,7 +24276,7 @@ rs70_648 //
@source:skeleton/monon_color.cpp
mononcol // (c) 2011 M&D
-@source:misc_handheld/monty.cpp
+@source:handheld/monty.cpp
mmonty // Ritam
monty // Ritam
@@ -34199,14 +34199,14 @@ palmz22 // Palm Z22
@source:konami/pandoras.cpp
pandoras // GX328 (c) 1984 + Interlogic
-@source:ibmpc/pangofun.cpp
+@source:pc/pangofun.cpp
pangofun // (c) 1995 InfoCube
@source:seibu/panicr.cpp
panicr // Seibu / Taito
panicrg // Seibu / TV-Tuning (Germany)
-@source:ibmpc/paokaipc.cpp
+@source:pc/paokaipc.cpp
gogostrk //
@source:yunsung/paradise.cpp
@@ -34455,11 +34455,11 @@ pc9821v20 // 1998
pc9821xa16 // 1996
pc9821xs // 1994
-@source:ibmpc/pcat_dyn.cpp
+@source:pc/pcat_dyn.cpp
toursol // (c) 1995 Dynamo
toursol1 // (c) 1995 Dynamo
-@source:ibmpc/pcat_nit.cpp
+@source:pc/pcat_nit.cpp
bonanza // (c) 1993
bonanzar2 // (c) 1993
streetg // (c) 1993
@@ -34514,7 +34514,7 @@ pcw9512p // 1991 PCW9512+
@source:amstrad/pcw16.cpp
pcw16 // 1995 PCW16
-@source:ibmpc/pcxt.cpp
+@source:pc/pcxt.cpp
filetto // (c) 1990 Novamatic
tetriskr // (c) 1988? bootleg
@@ -35856,7 +35856,7 @@ pockstat // 1999 Sony PocketStation
@source:atari/pofo.cpp
pofo //
-@source:xussrpc/poisk1.cpp
+@source:pc/poisk1.cpp
poisk1 //
@source:dgrm/pokechmp.cpp
@@ -36186,7 +36186,7 @@ proteus // Poly Proteus
@source:skeleton/proteus3.cpp
proteus3 //
-@source:at/ps2.cpp
+@source:pc/ps2.cpp
i8530286 // IBM PS/2 Model 30-286
i8530h31 // IBM PS/2 8530-H31 (Model 30/286)
i8535043 // IBM PS/2 8535-043 (Model 35)
@@ -36392,7 +36392,7 @@ tonto //
@source:skeleton/qtsbc.cpp
qtsbc //
-@source:ibmpc/quakeat.cpp
+@source:pc/quakeat.cpp
quake // (c) 19?? Lazer-Tron / iD Software
@source:skeleton/controlid.cpp
@@ -36407,7 +36407,7 @@ quantump // 136016 (c) 1982 // made by G
quasar // (c) 1980 Zelco Games Italy
quasara // (c) 1980 Zelco Games Italy
-@source:ibmpc/queen.cpp
+@source:pc/queen.cpp
queen //
@source:nmk/quizdna.cpp
@@ -36687,7 +36687,7 @@ zerohour // 8011 (c) Universal
zerohoura // 8011 (c) Universal
zerohouri //
-@source:misc_chess/regence.cpp
+@source:chess/regence.cpp
regence
@source:atari/relief.cpp
@@ -37026,7 +37026,7 @@ rx78 //
@source:casio/rz1.cpp
rz1 // 1986 Casio
-@source:misc_handheld/rzone.cpp
+@source:handheld/rzone.cpp
rzbatfor //
rzindy500 //
rztoshden //
@@ -37668,7 +37668,7 @@ scorpio //
@source:konami/scotrsht.cpp
scotrsht // GX545 (c) 1985
-@source:misc_handheld/scrablex.cpp
+@source:handheld/scrablex.cpp
scrablex // Selchow & Righter
@source:galaxian/scramble.cpp
@@ -39053,7 +39053,7 @@ simpsons2pj // GX072 (c) 1991 (Japan)
simpsons4pa // GX072 (c) 1991 (Asia)
simpsons4pe // GX072 (c) 1991 (World)
-@source:ibmpc/sis630.cpp
+@source:pc/sis630.cpp
gamecst2 // MAME based bootleg, version 2.613
gamecstl // MAME based bootleg
shutms11 // (c) 2000
@@ -41211,10 +41211,10 @@ taitotz //
@source:taito/taitowlf.cpp
pf2012 // E59 (c) 1997 Taito
-@source:misc_handheld/talkingbb.cpp
+@source:handheld/talkingbb.cpp
talkingbb
-@source:misc_handheld/talkingfb.cpp
+@source:handheld/talkingfb.cpp
talkingfb
@source:bandai/tamag1.cpp
@@ -41261,7 +41261,7 @@ targeth // (c) 1994 - Ref 940531
targetha // (c) 1994 - Ref 940531
targeth10 // (c) 1994 - Ref 940531
-@source:misc_chess/tasc.cpp
+@source:chess/tasc.cpp
tascr30
tascr30a
tascr30b
@@ -41692,7 +41692,7 @@ tc2048 // 198? TC2048
ts2068 // 1983 TS2068
uk2086 // 1986 UK2086
-@source:misc_handheld/tispeak.cpp
+@source:handheld/tispeak.cpp
k28m2 // Tiger Electronics
lantutor //
snmath //
@@ -41718,7 +41718,7 @@ tntellp //
tntelluk //
vocaid //
-@source:misc_handheld/tispellb.cpp
+@source:handheld/tispellb.cpp
mrchalgr //
spellb //
spellb79 //
@@ -43551,7 +43551,7 @@ wicat //
@source:pinball/wico.cpp
aftor //
-@source:misc_handheld/wildfire.cpp
+@source:handheld/wildfire.cpp
wildfire // Parker Bros
@source:misc/wildpkr.cpp
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index f273860e681..8578737112a 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -62,10 +62,6 @@ appliedconcepts/ggm.cpp
appliedconcepts/prodigy.cpp
appliedtech/mbee.cpp
arcadia/arcadia.cpp
-at/at.cpp
-at/atpci.cpp
-at/ct486.cpp
-at/ps2.cpp
atari/a2600.cpp
atari/a7800.cpp
atari/atari400.cpp
@@ -117,6 +113,14 @@ casio/sx1000.cpp
cce/mc1000.cpp
ccs/ccs2810.cpp
ceres/ceres.cpp
+chess/ave_arb.cpp
+chess/cking_master.cpp
+chess/compuchess.cpp
+chess/conic_cchess2.cpp
+chess/conic_cchess3.cpp
+chess/conchess.cpp
+chess/regence.cpp
+chess/tasc.cpp
chromatics/cgc7900.cpp
chrysler/eva.cpp
citoh/cit101.cpp
@@ -263,6 +267,24 @@ gamepark/gp32.cpp
gridcomp/gridcomp.cpp
grundy/newbrain.cpp
h01x/h01x.cpp
+handheld/hh_cop400.cpp
+handheld/hh_cops1.cpp
+handheld/hh_hmcs40.cpp
+handheld/hh_melps4.cpp
+handheld/hh_pic16.cpp
+handheld/hh_pps41.cpp
+handheld/hh_rw5000.cpp
+handheld/hh_sm510.cpp
+handheld/hh_tms1k.cpp
+handheld/hh_ucom4.cpp
+handheld/monty.cpp
+handheld/rzone.cpp
+handheld/scrablex.cpp
+handheld/talkingbb.cpp
+handheld/talkingfb.cpp
+handheld/tispeak.cpp
+handheld/tispellb.cpp
+handheld/wildfire.cpp
hartung/gmaster.cpp
hds/hds200.cpp
heathkit/et3400.cpp
@@ -342,7 +364,6 @@ husky/hunter16.cpp
husky/hunter2.cpp
husky/husky.cpp
ibm6580/ibm6580.cpp
-ibmpc/sis630.cpp
ie15/ie15.cpp
informer/informer_207_100.cpp
informer/informer_207_376.cpp
@@ -433,32 +454,6 @@ miltonbradley/milton6805.cpp
miltonbradley/vectrex.cpp
mips/mips.cpp
misc/3do.cpp
-misc_chess/ave_arb.cpp
-misc_chess/cking_master.cpp
-misc_chess/compuchess.cpp
-misc_chess/conic_cchess2.cpp
-misc_chess/conic_cchess3.cpp
-misc_chess/conchess.cpp
-misc_chess/regence.cpp
-misc_chess/tasc.cpp
-misc_handheld/hh_cop400.cpp
-misc_handheld/hh_cops1.cpp
-misc_handheld/hh_hmcs40.cpp
-misc_handheld/hh_melps4.cpp
-misc_handheld/hh_pic16.cpp
-misc_handheld/hh_pps41.cpp
-misc_handheld/hh_rw5000.cpp
-misc_handheld/hh_sm510.cpp
-misc_handheld/hh_tms1k.cpp
-misc_handheld/hh_ucom4.cpp
-misc_handheld/monty.cpp
-misc_handheld/rzone.cpp
-misc_handheld/scrablex.cpp
-misc_handheld/talkingbb.cpp
-misc_handheld/talkingfb.cpp
-misc_handheld/tispeak.cpp
-misc_handheld/tispellb.cpp
-misc_handheld/wildfire.cpp
mit/tx0.cpp
mits/altair.cpp
mits/mits680b.cpp
@@ -564,14 +559,23 @@ osi/osi.cpp
palm/palm.cpp
palm/palmz22.cpp
pc/asst128.cpp
+pc/at.cpp
+pc/atpci.cpp
pc/compc.cpp
+pc/ct486.cpp
+pc/ec184x.cpp
pc/europc.cpp
pc/genpc.cpp
pc/ibmpc.cpp
pc/ibmpcjr.cpp
+pc/iskr103x.cpp
+pc/mc1502.cpp
pc/nforcepc.cpp
pc/pc.cpp
pc/pcipc.cpp
+pc/poisk1.cpp
+pc/ps2.cpp
+pc/sis630.cpp
pc/tandy1t.cpp
pc/tosh1000.cpp
pdp1/pdp1.cpp
@@ -1232,10 +1236,6 @@ xerox/alto1.cpp
xerox/alto2.cpp
xerox/bigbord2.cpp
xerox/xerox820.cpp
-xussrpc/ec184x.cpp
-xussrpc/iskr103x.cpp
-xussrpc/mc1502.cpp
-xussrpc/poisk1.cpp
yamaha/fb01.cpp
yamaha/tg100.cpp
yamaha/yman1x.cpp
@@ -1289,7 +1289,7 @@ zvt/pp01.cpp
//neogeo/neogeo.cpp
+aes
-//sis630
+//pc/sis630.cpp
-gamecst2
-gamecstl
diff --git a/src/mame/misc_chess/README.md b/src/mame/misc_chess/README.md
deleted file mode 100644
index 74d62771d11..00000000000
--- a/src/mame/misc_chess/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# **src/mame/misc_chess** #
-
-Folder for miscellaneous chesscomputer drivers, where the number of drivers is too small to place them in specific company folders. \ No newline at end of file
diff --git a/src/mame/misc_handheld/README.md b/src/mame/misc_handheld/README.md
deleted file mode 100644
index a5c5ca5e053..00000000000
--- a/src/mame/misc_handheld/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# **src/mame/misc_handheld** #
-
-Folder for miscellaneous handheld/tabletop drivers, where the number of drivers is too small to place them in specific company folders.
-This also includes the hh_ collection drivers and their subclasses. \ No newline at end of file
diff --git a/src/mame/pc/README.md b/src/mame/pc/README.md
new file mode 100644
index 00000000000..ea9e4fcc428
--- /dev/null
+++ b/src/mame/pc/README.md
@@ -0,0 +1,3 @@
+# **src/mame/pc** #
+
+Generic folder with MAME drivers for IBM PC, PC compatibles, or PC-based arcade hardware. \ No newline at end of file
diff --git a/src/mame/at/at.cpp b/src/mame/pc/at.cpp
index 18ef2ee0e7a..18ef2ee0e7a 100644
--- a/src/mame/at/at.cpp
+++ b/src/mame/pc/at.cpp
diff --git a/src/mame/at/atpci.cpp b/src/mame/pc/atpci.cpp
index b879844dd7b..b879844dd7b 100644
--- a/src/mame/at/atpci.cpp
+++ b/src/mame/pc/atpci.cpp
diff --git a/src/mame/ibmpc/calchase.cpp b/src/mame/pc/calchase.cpp
index 5a68b845335..5a68b845335 100644
--- a/src/mame/ibmpc/calchase.cpp
+++ b/src/mame/pc/calchase.cpp
diff --git a/src/mame/at/ct486.cpp b/src/mame/pc/ct486.cpp
index 23a4b1dc811..23a4b1dc811 100644
--- a/src/mame/at/ct486.cpp
+++ b/src/mame/pc/ct486.cpp
diff --git a/src/mame/xussrpc/ec184x.cpp b/src/mame/pc/ec184x.cpp
index f5f03e39670..f5f03e39670 100644
--- a/src/mame/xussrpc/ec184x.cpp
+++ b/src/mame/pc/ec184x.cpp
diff --git a/src/mame/ibmpc/fruitpc.cpp b/src/mame/pc/fruitpc.cpp
index b8fd10fdef2..b8fd10fdef2 100644
--- a/src/mame/ibmpc/fruitpc.cpp
+++ b/src/mame/pc/fruitpc.cpp
diff --git a/src/mame/ibmpc/igspc.cpp b/src/mame/pc/igspc.cpp
index 0384a918fa4..0384a918fa4 100644
--- a/src/mame/ibmpc/igspc.cpp
+++ b/src/mame/pc/igspc.cpp
diff --git a/src/mame/xussrpc/iskr103x.cpp b/src/mame/pc/iskr103x.cpp
index 694ac815ce2..694ac815ce2 100644
--- a/src/mame/xussrpc/iskr103x.cpp
+++ b/src/mame/pc/iskr103x.cpp
diff --git a/src/mame/xussrpc/kb_7007_3.h b/src/mame/pc/kb_7007_3.h
index 28427d4a2f9..28427d4a2f9 100644
--- a/src/mame/xussrpc/kb_7007_3.h
+++ b/src/mame/pc/kb_7007_3.h
diff --git a/src/mame/xussrpc/kb_poisk1.h b/src/mame/pc/kb_poisk1.h
index 21e206059f0..21e206059f0 100644
--- a/src/mame/xussrpc/kb_poisk1.h
+++ b/src/mame/pc/kb_poisk1.h
diff --git a/src/mame/xussrpc/mc1502.cpp b/src/mame/pc/mc1502.cpp
index bc55bc7d8a9..bc55bc7d8a9 100644
--- a/src/mame/xussrpc/mc1502.cpp
+++ b/src/mame/pc/mc1502.cpp
diff --git a/src/mame/ibmpc/pangofun.cpp b/src/mame/pc/pangofun.cpp
index 3dfaf4e9843..3dfaf4e9843 100644
--- a/src/mame/ibmpc/pangofun.cpp
+++ b/src/mame/pc/pangofun.cpp
diff --git a/src/mame/ibmpc/paokaipc.cpp b/src/mame/pc/paokaipc.cpp
index ca24b71fd75..ca24b71fd75 100644
--- a/src/mame/ibmpc/paokaipc.cpp
+++ b/src/mame/pc/paokaipc.cpp
diff --git a/src/mame/ibmpc/pcat_dyn.cpp b/src/mame/pc/pcat_dyn.cpp
index f8b9f702a47..f8b9f702a47 100644
--- a/src/mame/ibmpc/pcat_dyn.cpp
+++ b/src/mame/pc/pcat_dyn.cpp
diff --git a/src/mame/ibmpc/pcat_nit.cpp b/src/mame/pc/pcat_nit.cpp
index 3191f6ced78..3191f6ced78 100644
--- a/src/mame/ibmpc/pcat_nit.cpp
+++ b/src/mame/pc/pcat_nit.cpp
diff --git a/src/mame/ibmpc/pcxt.cpp b/src/mame/pc/pcxt.cpp
index 06e288bfb56..06e288bfb56 100644
--- a/src/mame/ibmpc/pcxt.cpp
+++ b/src/mame/pc/pcxt.cpp
diff --git a/src/mame/xussrpc/poisk1.cpp b/src/mame/pc/poisk1.cpp
index cf76b136200..cf76b136200 100644
--- a/src/mame/xussrpc/poisk1.cpp
+++ b/src/mame/pc/poisk1.cpp
diff --git a/src/mame/at/ps2.cpp b/src/mame/pc/ps2.cpp
index fa5696aacb1..fa5696aacb1 100644
--- a/src/mame/at/ps2.cpp
+++ b/src/mame/pc/ps2.cpp
diff --git a/src/mame/ibmpc/quakeat.cpp b/src/mame/pc/quakeat.cpp
index 5fc80a67b48..5fc80a67b48 100644
--- a/src/mame/ibmpc/quakeat.cpp
+++ b/src/mame/pc/quakeat.cpp
diff --git a/src/mame/ibmpc/queen.cpp b/src/mame/pc/queen.cpp
index 70791d7c10c..70791d7c10c 100644
--- a/src/mame/ibmpc/queen.cpp
+++ b/src/mame/pc/queen.cpp
diff --git a/src/mame/ibmpc/sis630.cpp b/src/mame/pc/sis630.cpp
index 1a452974a86..1a452974a86 100644
--- a/src/mame/ibmpc/sis630.cpp
+++ b/src/mame/pc/sis630.cpp