summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Fabio Priuli <etabeta78@users.noreply.github.com>2014-08-24 08:42:23 +0000
committer Fabio Priuli <etabeta78@users.noreply.github.com>2014-08-24 08:42:23 +0000
commit9ffe9e8bbaf66fbfe851a2b0abc29aa21c493ac3 (patch)
treea4b8dd63ee374766f5535b833a751a994e3cba5c
parenta1c421704f5d90ecd90692e2ab9e241ab0ea2b0d (diff)
I had to split this commit in two pieces because "svn move" does not like when you move a folder
and then you add a new folder with the original name of the one you moved. the tree will compile again with next commit. nw.
-rw-r--r--.gitattributes28
-rw-r--r--src/emu/bus/plus4/sid.h2
-rw-r--r--src/emu/bus/vcs_ctrl/ctrl.c (renamed from src/emu/bus/vcs/ctrl.c)0
-rw-r--r--src/emu/bus/vcs_ctrl/ctrl.h (renamed from src/emu/bus/vcs/ctrl.h)0
-rw-r--r--src/emu/bus/vcs_ctrl/joybooster.c (renamed from src/emu/bus/vcs/joybooster.c)0
-rw-r--r--src/emu/bus/vcs_ctrl/joybooster.h (renamed from src/emu/bus/vcs/joybooster.h)0
-rw-r--r--src/emu/bus/vcs_ctrl/joystick.c (renamed from src/emu/bus/vcs/joystick.c)0
-rw-r--r--src/emu/bus/vcs_ctrl/joystick.h (renamed from src/emu/bus/vcs/joystick.h)0
-rw-r--r--src/emu/bus/vcs_ctrl/keypad.c (renamed from src/emu/bus/vcs/keypad.c)0
-rw-r--r--src/emu/bus/vcs_ctrl/keypad.h (renamed from src/emu/bus/vcs/keypad.h)0
-rw-r--r--src/emu/bus/vcs_ctrl/lightpen.c (renamed from src/emu/bus/vcs/lightpen.c)0
-rw-r--r--src/emu/bus/vcs_ctrl/lightpen.h (renamed from src/emu/bus/vcs/lightpen.h)0
-rw-r--r--src/emu/bus/vcs_ctrl/paddles.c (renamed from src/emu/bus/vcs/paddles.c)0
-rw-r--r--src/emu/bus/vcs_ctrl/paddles.h (renamed from src/emu/bus/vcs/paddles.h)0
-rw-r--r--src/emu/bus/vcs_ctrl/wheel.c (renamed from src/emu/bus/vcs/wheel.c)0
-rw-r--r--src/emu/bus/vcs_ctrl/wheel.h (renamed from src/emu/bus/vcs/wheel.h)0
-rw-r--r--src/mess/includes/c128.h2
-rw-r--r--src/mess/includes/c64.h2
-rw-r--r--src/mess/includes/cbm2.h2
-rw-r--r--src/mess/includes/plus4.h2
-rw-r--r--src/mess/includes/vic10.h2
-rw-r--r--src/mess/includes/vic20.h2
-rw-r--r--src/mess/mess.mak1
23 files changed, 22 insertions, 21 deletions
diff --git a/.gitattributes b/.gitattributes
index 3d0022cb6a4..949fcc0ec52 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1526,20 +1526,20 @@ src/emu/bus/tvc/hbf.c svneol=native#text/plain
src/emu/bus/tvc/hbf.h svneol=native#text/plain
src/emu/bus/tvc/tvc.c svneol=native#text/plain
src/emu/bus/tvc/tvc.h svneol=native#text/plain
-src/emu/bus/vcs/ctrl.c svneol=native#text/plain
-src/emu/bus/vcs/ctrl.h svneol=native#text/plain
-src/emu/bus/vcs/joybooster.c svneol=native#text/plain
-src/emu/bus/vcs/joybooster.h svneol=native#text/plain
-src/emu/bus/vcs/joystick.c svneol=native#text/plain
-src/emu/bus/vcs/joystick.h svneol=native#text/plain
-src/emu/bus/vcs/keypad.c svneol=native#text/plain
-src/emu/bus/vcs/keypad.h svneol=native#text/plain
-src/emu/bus/vcs/lightpen.c svneol=native#text/plain
-src/emu/bus/vcs/lightpen.h svneol=native#text/plain
-src/emu/bus/vcs/paddles.c svneol=native#text/plain
-src/emu/bus/vcs/paddles.h svneol=native#text/plain
-src/emu/bus/vcs/wheel.c svneol=native#text/plain
-src/emu/bus/vcs/wheel.h svneol=native#text/plain
+src/emu/bus/vcs_ctrl/ctrl.c svneol=native#text/plain
+src/emu/bus/vcs_ctrl/ctrl.h svneol=native#text/plain
+src/emu/bus/vcs_ctrl/joybooster.c svneol=native#text/plain
+src/emu/bus/vcs_ctrl/joybooster.h svneol=native#text/plain
+src/emu/bus/vcs_ctrl/joystick.c svneol=native#text/plain
+src/emu/bus/vcs_ctrl/joystick.h svneol=native#text/plain
+src/emu/bus/vcs_ctrl/keypad.c svneol=native#text/plain
+src/emu/bus/vcs_ctrl/keypad.h svneol=native#text/plain
+src/emu/bus/vcs_ctrl/lightpen.c svneol=native#text/plain
+src/emu/bus/vcs_ctrl/lightpen.h svneol=native#text/plain
+src/emu/bus/vcs_ctrl/paddles.c svneol=native#text/plain
+src/emu/bus/vcs_ctrl/paddles.h svneol=native#text/plain
+src/emu/bus/vcs_ctrl/wheel.c svneol=native#text/plain
+src/emu/bus/vcs_ctrl/wheel.h svneol=native#text/plain
src/emu/bus/vic10/exp.c svneol=native#text/plain
src/emu/bus/vic10/exp.h svneol=native#text/plain
src/emu/bus/vic10/std.c svneol=native#text/plain
diff --git a/src/emu/bus/plus4/sid.h b/src/emu/bus/plus4/sid.h
index 830a2fe0f42..5a4f327ec99 100644
--- a/src/emu/bus/plus4/sid.h
+++ b/src/emu/bus/plus4/sid.h
@@ -16,7 +16,7 @@
#include "emu.h"
#include "exp.h"
-#include "bus/vcs/ctrl.h"
+#include "bus/vcs_ctrl/ctrl.h"
#include "sound/dac.h"
#include "sound/mos6581.h"
diff --git a/src/emu/bus/vcs/ctrl.c b/src/emu/bus/vcs_ctrl/ctrl.c
index 226ea75bf67..226ea75bf67 100644
--- a/src/emu/bus/vcs/ctrl.c
+++ b/src/emu/bus/vcs_ctrl/ctrl.c
diff --git a/src/emu/bus/vcs/ctrl.h b/src/emu/bus/vcs_ctrl/ctrl.h
index ab01e6ab942..ab01e6ab942 100644
--- a/src/emu/bus/vcs/ctrl.h
+++ b/src/emu/bus/vcs_ctrl/ctrl.h
diff --git a/src/emu/bus/vcs/joybooster.c b/src/emu/bus/vcs_ctrl/joybooster.c
index e2654968dc8..e2654968dc8 100644
--- a/src/emu/bus/vcs/joybooster.c
+++ b/src/emu/bus/vcs_ctrl/joybooster.c
diff --git a/src/emu/bus/vcs/joybooster.h b/src/emu/bus/vcs_ctrl/joybooster.h
index 8f4c3bf9ca2..8f4c3bf9ca2 100644
--- a/src/emu/bus/vcs/joybooster.h
+++ b/src/emu/bus/vcs_ctrl/joybooster.h
diff --git a/src/emu/bus/vcs/joystick.c b/src/emu/bus/vcs_ctrl/joystick.c
index 3ef46b0246c..3ef46b0246c 100644
--- a/src/emu/bus/vcs/joystick.c
+++ b/src/emu/bus/vcs_ctrl/joystick.c
diff --git a/src/emu/bus/vcs/joystick.h b/src/emu/bus/vcs_ctrl/joystick.h
index 7de13ff3c36..7de13ff3c36 100644
--- a/src/emu/bus/vcs/joystick.h
+++ b/src/emu/bus/vcs_ctrl/joystick.h
diff --git a/src/emu/bus/vcs/keypad.c b/src/emu/bus/vcs_ctrl/keypad.c
index a41db6d400a..a41db6d400a 100644
--- a/src/emu/bus/vcs/keypad.c
+++ b/src/emu/bus/vcs_ctrl/keypad.c
diff --git a/src/emu/bus/vcs/keypad.h b/src/emu/bus/vcs_ctrl/keypad.h
index 628731b2350..628731b2350 100644
--- a/src/emu/bus/vcs/keypad.h
+++ b/src/emu/bus/vcs_ctrl/keypad.h
diff --git a/src/emu/bus/vcs/lightpen.c b/src/emu/bus/vcs_ctrl/lightpen.c
index bf5a82997c0..bf5a82997c0 100644
--- a/src/emu/bus/vcs/lightpen.c
+++ b/src/emu/bus/vcs_ctrl/lightpen.c
diff --git a/src/emu/bus/vcs/lightpen.h b/src/emu/bus/vcs_ctrl/lightpen.h
index c18a2a4a368..c18a2a4a368 100644
--- a/src/emu/bus/vcs/lightpen.h
+++ b/src/emu/bus/vcs_ctrl/lightpen.h
diff --git a/src/emu/bus/vcs/paddles.c b/src/emu/bus/vcs_ctrl/paddles.c
index 61bc71c8bdf..61bc71c8bdf 100644
--- a/src/emu/bus/vcs/paddles.c
+++ b/src/emu/bus/vcs_ctrl/paddles.c
diff --git a/src/emu/bus/vcs/paddles.h b/src/emu/bus/vcs_ctrl/paddles.h
index 7363d05bf25..7363d05bf25 100644
--- a/src/emu/bus/vcs/paddles.h
+++ b/src/emu/bus/vcs_ctrl/paddles.h
diff --git a/src/emu/bus/vcs/wheel.c b/src/emu/bus/vcs_ctrl/wheel.c
index ee8b6cb2987..ee8b6cb2987 100644
--- a/src/emu/bus/vcs/wheel.c
+++ b/src/emu/bus/vcs_ctrl/wheel.c
diff --git a/src/emu/bus/vcs/wheel.h b/src/emu/bus/vcs_ctrl/wheel.h
index 07bcafd0534..07bcafd0534 100644
--- a/src/emu/bus/vcs/wheel.h
+++ b/src/emu/bus/vcs_ctrl/wheel.h
diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h
index 57e74497954..2af670a8c44 100644
--- a/src/mess/includes/c128.h
+++ b/src/mess/includes/c128.h
@@ -10,7 +10,7 @@
#include "bus/c64/exp.h"
#include "bus/vic20/user.h"
#include "bus/pet/cass.h"
-#include "bus/vcs/ctrl.h"
+#include "bus/vcs_ctrl/ctrl.h"
#include "imagedev/snapquik.h"
#include "cpu/m6502/m8502.h"
#include "machine/mos6526.h"
diff --git a/src/mess/includes/c64.h b/src/mess/includes/c64.h
index 6b0aa08fc79..a8047f665a7 100644
--- a/src/mess/includes/c64.h
+++ b/src/mess/includes/c64.h
@@ -10,7 +10,7 @@
#include "bus/c64/exp.h"
#include "bus/vic20/user.h"
#include "bus/pet/cass.h"
-#include "bus/vcs/ctrl.h"
+#include "bus/vcs_ctrl/ctrl.h"
#include "cpu/m6502/m6510.h"
#include "imagedev/snapquik.h"
#include "machine/mos6526.h"
diff --git a/src/mess/includes/cbm2.h b/src/mess/includes/cbm2.h
index a94419e349d..4cdf19cebc2 100644
--- a/src/mess/includes/cbm2.h
+++ b/src/mess/includes/cbm2.h
@@ -10,7 +10,7 @@
#include "bus/cbm2/user.h"
#include "bus/ieee488/ieee488.h"
#include "bus/pet/cass.h"
-#include "bus/vcs/ctrl.h"
+#include "bus/vcs_ctrl/ctrl.h"
#include "cpu/m6502/m6509.h"
#include "cpu/i86/i86.h"
#include "machine/cbm_snqk.h"
diff --git a/src/mess/includes/plus4.h b/src/mess/includes/plus4.h
index c9c23222581..8d634cf1401 100644
--- a/src/mess/includes/plus4.h
+++ b/src/mess/includes/plus4.h
@@ -10,7 +10,7 @@
#include "bus/pet/cass.h"
#include "bus/plus4/exp.h"
#include "bus/plus4/user.h"
-#include "bus/vcs/ctrl.h"
+#include "bus/vcs_ctrl/ctrl.h"
#include "cpu/m6502/m7501.h"
#include "imagedev/snapquik.h"
#include "machine/mos6529.h"
diff --git a/src/mess/includes/vic10.h b/src/mess/includes/vic10.h
index 847b499fdbc..5068bca4454 100644
--- a/src/mess/includes/vic10.h
+++ b/src/mess/includes/vic10.h
@@ -8,7 +8,7 @@
#include "emu.h"
#include "bus/pet/cass.h"
#include "bus/vic10/exp.h"
-#include "bus/vcs/ctrl.h"
+#include "bus/vcs_ctrl/ctrl.h"
#include "cpu/m6502/m6510.h"
#include "machine/mos6526.h"
#include "machine/ram.h"
diff --git a/src/mess/includes/vic20.h b/src/mess/includes/vic20.h
index 7feeba63f8b..3381773f9d4 100644
--- a/src/mess/includes/vic20.h
+++ b/src/mess/includes/vic20.h
@@ -8,7 +8,7 @@
#include "emu.h"
#include "bus/cbmiec/cbmiec.h"
#include "bus/pet/cass.h"
-#include "bus/vcs/ctrl.h"
+#include "bus/vcs_ctrl/ctrl.h"
#include "bus/vic20/exp.h"
#include "bus/vic20/user.h"
#include "cpu/m6502/m6510.h"
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index 03efc4aa20c..55df245aeb1 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -614,6 +614,7 @@ BUSES += SNES
BUSES += TI99PEB
BUSES += TVC
BUSES += VCS
+BUSES += VCS_CTRL
BUSES += VIC10
BUSES += VIC20
BUSES += VIDBRAIN