Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-04 03:46:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Moved TI-99/4A expansion cards to emu/bus/ti99_peb.

Browse Source
This commit is contained in:
Michael Zapf 2014-03-21 19:13:27 +00:00
parent e336d2f6a2
commit 1b7f7f7217
41 changed files with 90 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
.gitattributes vendored
View File

@ -1244,6 +1244,38 @@ src/emu/bus/snes/sufami.c svneol=native#text/plain
src/emu/bus/snes/sufami.h svneol=native#text/plain
src/emu/bus/snes/upd.c svneol=native#text/plain
src/emu/bus/snes/upd.h svneol=native#text/plain
src/emu/bus/ti99_peb/bwg.c svneol=native#text/plain
src/emu/bus/ti99_peb/bwg.h svneol=native#text/plain
src/emu/bus/ti99_peb/evpc.c svneol=native#text/plain
src/emu/bus/ti99_peb/evpc.h svneol=native#text/plain
src/emu/bus/ti99_peb/hfdc.c svneol=native#text/plain
src/emu/bus/ti99_peb/hfdc.h svneol=native#text/plain
src/emu/bus/ti99_peb/horizon.c svneol=native#text/plain
src/emu/bus/ti99_peb/horizon.h svneol=native#text/plain
src/emu/bus/ti99_peb/hsgpl.c svneol=native#text/plain
src/emu/bus/ti99_peb/hsgpl.h svneol=native#text/plain
src/emu/bus/ti99_peb/memex.c svneol=native#text/plain
src/emu/bus/ti99_peb/memex.h svneol=native#text/plain
src/emu/bus/ti99_peb/myarcmem.c svneol=native#text/plain
src/emu/bus/ti99_peb/myarcmem.h svneol=native#text/plain
src/emu/bus/ti99_peb/pcode.c svneol=native#text/plain
src/emu/bus/ti99_peb/pcode.h svneol=native#text/plain
src/emu/bus/ti99_peb/peribox.c svneol=native#text/plain
src/emu/bus/ti99_peb/peribox.h svneol=native#text/plain
src/emu/bus/ti99_peb/samsmem.c svneol=native#text/plain
src/emu/bus/ti99_peb/samsmem.h svneol=native#text/plain
src/emu/bus/ti99_peb/spchsyn.c svneol=native#text/plain
src/emu/bus/ti99_peb/spchsyn.h svneol=native#text/plain
src/emu/bus/ti99_peb/ti_32kmem.c svneol=native#text/plain
src/emu/bus/ti99_peb/ti_32kmem.h svneol=native#text/plain
src/emu/bus/ti99_peb/ti_fdc.c svneol=native#text/plain
src/emu/bus/ti99_peb/ti_fdc.h svneol=native#text/plain
src/emu/bus/ti99_peb/ti_rs232.c svneol=native#text/plain
src/emu/bus/ti99_peb/ti_rs232.h svneol=native#text/plain
src/emu/bus/ti99_peb/tn_ide.c svneol=native#text/plain
src/emu/bus/ti99_peb/tn_ide.h svneol=native#text/plain
src/emu/bus/ti99_peb/tn_usbsm.c svneol=native#text/plain
src/emu/bus/ti99_peb/tn_usbsm.h svneol=native#text/plain
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
@ -8549,12 +8581,8 @@ src/mess/machine/ti99/990_hd.c svneol=native#text/plain
src/mess/machine/ti99/990_hd.h svneol=native#text/plain
src/mess/machine/ti99/990_tap.c svneol=native#text/plain
src/mess/machine/ti99/990_tap.h svneol=native#text/plain
src/mess/machine/ti99/bwg.c svneol=native#text/plain
src/mess/machine/ti99/bwg.h svneol=native#text/plain
src/mess/machine/ti99/datamux.c svneol=native#text/plain
src/mess/machine/ti99/datamux.h svneol=native#text/plain
src/mess/machine/ti99/evpc.c svneol=native#text/plain
src/mess/machine/ti99/evpc.h svneol=native#text/plain
src/mess/machine/ti99/genboard.c svneol=native#text/plain
src/mess/machine/ti99/genboard.h svneol=native#text/plain
src/mess/machine/ti99/grom.c svneol=native#text/plain
@ -8563,47 +8591,19 @@ src/mess/machine/ti99/gromport.c svneol=native#text/plain
src/mess/machine/ti99/gromport.h svneol=native#text/plain
src/mess/machine/ti99/handset.c svneol=native#text/plain
src/mess/machine/ti99/handset.h svneol=native#text/plain
src/mess/machine/ti99/hfdc.c svneol=native#text/plain
src/mess/machine/ti99/hfdc.h svneol=native#text/plain
src/mess/machine/ti99/horizon.c svneol=native#text/plain
src/mess/machine/ti99/horizon.h svneol=native#text/plain
src/mess/machine/ti99/hsgpl.c svneol=native#text/plain
src/mess/machine/ti99/hsgpl.h svneol=native#text/plain
src/mess/machine/ti99/joyport.c svneol=native#text/plain
src/mess/machine/ti99/joyport.h svneol=native#text/plain
src/mess/machine/ti99/mapper8.c svneol=native#text/plain
src/mess/machine/ti99/mapper8.h svneol=native#text/plain
src/mess/machine/ti99/mecmouse.c svneol=native#text/plain
src/mess/machine/ti99/mecmouse.h svneol=native#text/plain
src/mess/machine/ti99/memex.c svneol=native#text/plain
src/mess/machine/ti99/memex.h svneol=native#text/plain
src/mess/machine/ti99/myarcmem.c svneol=native#text/plain
src/mess/machine/ti99/myarcmem.h svneol=native#text/plain
src/mess/machine/ti99/p_code.c svneol=native#text/plain
src/mess/machine/ti99/p_code.h svneol=native#text/plain
src/mess/machine/ti99/peribox.c svneol=native#text/plain
src/mess/machine/ti99/peribox.h svneol=native#text/plain
src/mess/machine/ti99/samsmem.c svneol=native#text/plain
src/mess/machine/ti99/samsmem.h svneol=native#text/plain
src/mess/machine/ti99/spchsyn.c svneol=native#text/plain
src/mess/machine/ti99/spchsyn.h svneol=native#text/plain
src/mess/machine/ti99/speech8.c svneol=native#text/plain
src/mess/machine/ti99/speech8.h svneol=native#text/plain
src/mess/machine/ti99/ti32kmem.c svneol=native#text/plain
src/mess/machine/ti99/ti32kmem.h svneol=native#text/plain
src/mess/machine/ti99/ti990.c svneol=native#text/plain
src/mess/machine/ti99/ti990.h svneol=native#text/plain
src/mess/machine/ti99/ti99_hd.c svneol=native#text/plain
src/mess/machine/ti99/ti99_hd.h svneol=native#text/plain
src/mess/machine/ti99/ti99defs.h svneol=native#text/plain
src/mess/machine/ti99/ti_fdc.c svneol=native#text/plain
src/mess/machine/ti99/ti_fdc.h svneol=native#text/plain
src/mess/machine/ti99/ti_rs232.c svneol=native#text/plain
src/mess/machine/ti99/ti_rs232.h svneol=native#text/plain
src/mess/machine/ti99/tn_ide.c svneol=native#text/plain
src/mess/machine/ti99/tn_ide.h svneol=native#text/plain
src/mess/machine/ti99/tn_usbsm.c svneol=native#text/plain
src/mess/machine/ti99/tn_usbsm.h svneol=native#text/plain
src/mess/machine/ti99/videowrp.c svneol=native#text/plain
src/mess/machine/ti99/videowrp.h svneol=native#text/plain
src/mess/machine/trs80.c svneol=native#text/plain

25
src/emu/bus/bus.mak
View File

@ -884,6 +884,31 @@ BUSOBJS += $(BUSOBJ)/sms_exp/smsexp.o
BUSOBJS += $(BUSOBJ)/sms_exp/gender.o
endif
#-------------------------------------------------
#
#@src/emu/bus/ti99_peb/peribox.h,BUSES += TI99PEB
#-------------------------------------------------
ifneq ($(filter TI99PEB,$(BUSES)),)
OBJDIRS += $(BUSOBJ)/ti99_peb
BUSOBJS += $(BUSOBJ)/ti99_peb/peribox.o
BUSOBJS += $(BUSOBJ)/ti99_peb/bwg.o
BUSOBJS += $(BUSOBJ)/ti99_peb/evpc.o
BUSOBJS += $(BUSOBJ)/ti99_peb/hfdc.o
BUSOBJS += $(BUSOBJ)/ti99_peb/horizon.o
BUSOBJS += $(BUSOBJ)/ti99_peb/hsgpl.o
BUSOBJS += $(BUSOBJ)/ti99_peb/memex.o
BUSOBJS += $(BUSOBJ)/ti99_peb/myarcmem.o
BUSOBJS += $(BUSOBJ)/ti99_peb/pcode.o
BUSOBJS += $(BUSOBJ)/ti99_peb/samsmem.o
BUSOBJS += $(BUSOBJ)/ti99_peb/spchsyn.o
BUSOBJS += $(BUSOBJ)/ti99_peb/ti_32kmem.o
BUSOBJS += $(BUSOBJ)/ti99_peb/ti_fdc.o
BUSOBJS += $(BUSOBJ)/ti99_peb/ti_rs232.o
BUSOBJS += $(BUSOBJ)/ti99_peb/tn_ide.o
BUSOBJS += $(BUSOBJ)/ti99_peb/tn_usbsm.o
endif
#-------------------------------------------------
#
#@src/emu/bus/gameboy/gb_slot.h,BUSES += GAMEBOY

0
src/mess/machine/ti99/bwg.c → src/emu/bus/ti99_peb/bwg.c
View File

1
src/mess/machine/ti99/bwg.h → src/emu/bus/ti99_peb/bwg.h
View File

@ -14,7 +14,6 @@
#ifndef __BWG__
#define __BWG__
#include "ti99defs.h"
#include "imagedev/flopdrv.h"
#include "machine/mm58274c.h"
#include "machine/wd_fdc.h"

0
src/mess/machine/ti99/evpc.c → src/emu/bus/ti99_peb/evpc.c
View File

1
src/mess/machine/ti99/evpc.h → src/emu/bus/ti99_peb/evpc.h
View File

@ -16,7 +16,6 @@
#define __EVPC__
#include "emu.h"
#include "ti99defs.h"
#include "peribox.h"
extern const device_type TI99_EVPC;

0
src/mess/machine/ti99/hfdc.c → src/emu/bus/ti99_peb/hfdc.c
View File

3
src/mess/machine/ti99/hfdc.h → src/emu/bus/ti99_peb/hfdc.h
View File

@ -16,8 +16,7 @@
#include "emu.h"
#include "peribox.h"
#include "ti99defs.h"
#include "ti99_hd.h"
#include "machine/ti99/ti99_hd.h"
#include "machine/smc92x4.h"
#include "machine/mm58274c.h"

0
src/mess/machine/ti99/horizon.c → src/emu/bus/ti99_peb/horizon.c
View File

1
src/mess/machine/ti99/horizon.h → src/emu/bus/ti99_peb/horizon.h
View File

@ -16,7 +16,6 @@
#include "emu.h"
#include "peribox.h"
#include "ti99defs.h"
extern const device_type TI99_HORIZON;

0
src/mess/machine/ti99/hsgpl.c → src/emu/bus/ti99_peb/hsgpl.c
View File

1
src/mess/machine/ti99/hsgpl.h → src/emu/bus/ti99_peb/hsgpl.h
View File

@ -17,7 +17,6 @@
#define __HSGPL__
#include "emu.h"
#include "ti99defs.h"
#include "peribox.h"
#include "machine/at29040a.h"

0
src/mess/machine/ti99/memex.c → src/emu/bus/ti99_peb/memex.c
View File

1
src/mess/machine/ti99/memex.h → src/emu/bus/ti99_peb/memex.h
View File

@ -14,7 +14,6 @@
#define __MEMEXMEM__
#include "emu.h"
#include "ti99defs.h"
#include "peribox.h"
extern const device_type TI99_MEMEX;

0
src/mess/machine/ti99/myarcmem.c → src/emu/bus/ti99_peb/myarcmem.c
View File

1
src/mess/machine/ti99/myarcmem.h → src/emu/bus/ti99_peb/myarcmem.h
View File

@ -15,7 +15,6 @@
#include "emu.h"
#include "peribox.h"
#include "ti99defs.h"
extern const device_type TI99_MYARCMEM;

2
src/mess/machine/ti99/p_code.c → src/emu/bus/ti99_peb/pcode.c
View File

@ -72,7 +72,7 @@
*****************************************************************************/
#include "p_code.h"
#include "pcode.h"
#define PCODE_GROM_TAG "pcode_grom"
#define PCODE_ROM_TAG "pcode_rom"

2
src/mess/machine/ti99/p_code.h → src/emu/bus/ti99_peb/pcode.h
View File

@ -17,7 +17,7 @@
#include "emu.h"
#include "peribox.h"
#include "grom.h"
#include "machine/ti99/grom.h"
extern const device_type TI99_P_CODE;

11
src/mess/machine/ti99/peribox.c → src/emu/bus/ti99_peb/peribox.c
View File

@ -179,12 +179,15 @@ CRUCLK* 51||52 DBIN
#include "emu.h"
#include "peribox.h"
// MFM hard drives
#include "machine/ti99/ti99_hd.h"
// The cards
#include "ti32kmem.h"
#include "ti_32kmem.h"
#include "ti_fdc.h"
#include "bwg.h"
#include "hfdc.h"
#include "p_code.h"
#include "pcode.h"
#include "myarcmem.h"
#include "samsmem.h"
#include "tn_ide.h"
@ -196,8 +199,12 @@ CRUCLK* 51||52 DBIN
#include "memex.h"
#include "horizon.h"
// Disk formats
#include "formats/ti99_dsk.h"
/*
Debugging flags. Set to 0 or 1.
*/
// Show interrupt line activity
#define TRACE_INT 0

2
src/mess/machine/ti99/peribox.h → src/emu/bus/ti99_peb/peribox.h
View File

@ -14,7 +14,7 @@
#ifndef __PBOX__
#define __PBOX__
#include "ti99defs.h"
#include "machine/ti99/ti99defs.h"
extern const device_type PERIBOX;
extern const device_type PERIBOX_SLOT;

0
src/mess/machine/ti99/samsmem.c → src/emu/bus/ti99_peb/samsmem.c
View File

1
src/mess/machine/ti99/samsmem.h → src/emu/bus/ti99_peb/samsmem.h
View File

@ -17,7 +17,6 @@
#include "emu.h"
#include "peribox.h"
#include "ti99defs.h"
extern const device_type TI99_SAMSMEM;

0
src/mess/machine/ti99/spchsyn.c → src/emu/bus/ti99_peb/spchsyn.c
View File

0
src/mess/machine/ti99/spchsyn.h → src/emu/bus/ti99_peb/spchsyn.h
View File

2
src/mess/machine/ti99/ti32kmem.c → src/emu/bus/ti99_peb/ti_32kmem.c
View File

@ -27,7 +27,7 @@
#include "emu.h"
#include "peribox.h"
#include "ti32kmem.h"
#include "ti_32kmem.h"
#define RAMREGION "ram"

2
src/mess/machine/ti99/ti32kmem.h → src/emu/bus/ti99_peb/ti_32kmem.h
View File

@ -14,8 +14,6 @@
#ifndef __TI32K__
#define __TI32K__
#include "ti99defs.h"
extern const device_type TI_32KMEM;
class ti_32k_expcard_device : public ti_expansion_card_device

0
src/mess/machine/ti99/ti_fdc.c → src/emu/bus/ti99_peb/ti_fdc.c
View File

1
src/mess/machine/ti99/ti_fdc.h → src/emu/bus/ti99_peb/ti_fdc.h
View File

@ -14,7 +14,6 @@
#ifndef __TIFDC__
#define __TIFDC__
#include "ti99defs.h"
#include "machine/wd_fdc.h"
#include "imagedev/floppy.h"

0
src/mess/machine/ti99/ti_rs232.c → src/emu/bus/ti99_peb/ti_rs232.c
View File

1
src/mess/machine/ti99/ti_rs232.h → src/emu/bus/ti99_peb/ti_rs232.h
View File

@ -15,7 +15,6 @@
#include "emu.h"
#include "peribox.h"
#include "ti99defs.h"
#include "machine/tms9902.h"
extern const device_type TI99_RS232;

2
src/mess/machine/ti99/tn_ide.c → src/emu/bus/ti99_peb/tn_ide.c
View File

@ -31,7 +31,7 @@
#include "peribox.h"
#include "machine/ataintf.h"
#include "tn_ide.h"
#include "ti99_hd.h"
#include "machine/ti99/ti99_hd.h"
#define CRU_BASE 0x1000

1
src/mess/machine/ti99/tn_ide.h → src/emu/bus/ti99_peb/tn_ide.h
View File

@ -15,7 +15,6 @@
#define __TNIDE__
#include "emu.h"
#include "ti99defs.h"
#include "machine/ataintf.h"
#include "machine/rtc65271.h"

0
src/mess/machine/ti99/tn_usbsm.c → src/emu/bus/ti99_peb/tn_usbsm.c
View File

1
src/mess/machine/ti99/tn_usbsm.h → src/emu/bus/ti99_peb/tn_usbsm.h
View File

@ -15,7 +15,6 @@
#define __USBSMART__
#include "emu.h"
#include "ti99defs.h"
#include "peribox.h"
#include "machine/smartmed.h"
#include "machine/strata.h"

2
src/mess/drivers/geneve.c
View File

@ -210,7 +210,7 @@
#include "sound/sn76496.h"
#include "machine/ti99/genboard.h"
#include "machine/ti99/peribox.h"
#include "bus/ti99_peb/peribox.h"
#include "machine/ti99/videowrp.h"
#include "machine/ti99/joyport.h"

14
src/mess/drivers/ti99_2.c
View File

@ -81,6 +81,11 @@ would just have taken three extra tracks on the main board and a OR gate in an A
#include "machine/tms9901.h"
#include "cpu/tms9900/tms9995.h"
// FIXME: The following includes are here for the sole purpose of forcing the linker to include the specified objects
#include "machine/smc92x4.h"
#include "machine/ti99/ti99_hd.h"
#include "machine/strata.h"
class ti99_2_state : public driver_device
{
public:
@ -89,7 +94,11 @@ public:
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
m_palette(*this, "palette"),
m_dummy1(*this, "linkingdummy1"),
m_dummy2(*this, "linkingdummy2"),
m_dummy3(*this, "linkingdummy3")
{ }
required_shared_ptr<UINT8> m_videoram;
int m_ROM_paged;
@ -107,6 +116,9 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
optional_device<smc92x4_device> m_dummy1;
optional_device<mfm_harddisk_device> m_dummy2;
optional_device<strataflash_device> m_dummy3;
};

4
src/mess/drivers/ti99_4p.c
View File

@ -43,11 +43,9 @@
#include "sound/dac.h"
#include "machine/tms9901.h"
#include "machine/ti99/peribox.h"
#include "imagedev/cassette.h"
#include "machine/ti99/videowrp.h"
#include "machine/ti99/peribox.h"
#include "bus/ti99_peb/peribox.h"
#include "machine/ti99/joyport.h"
#define TMS9901_TAG "tms9901"

2
src/mess/drivers/ti99_4x.c
View File

@ -51,7 +51,7 @@
#include "machine/ti99/grom.h"
#include "machine/ti99/gromport.h"
#include "machine/ti99/joyport.h"
#include "machine/ti99/peribox.h"
#include "bus/ti99_peb/peribox.h"
// Debugging
#define TRACE_READY 0

2
src/mess/drivers/ti99_8.c
View File

@ -208,7 +208,7 @@ Known Issues (MZ, 2010-11-07)
#include "machine/ti99/videowrp.h"
#include "machine/ti99/speech8.h"
#include "machine/ti99/peribox.h"
#include "bus/ti99_peb/peribox.h"
#include "machine/ti99/mapper8.h"
#include "machine/ti99/grom.h"
#include "machine/ti99/gromport.h"

1
src/mess/machine/ti99/mapper8.h
View File

@ -16,7 +16,6 @@
#define __MAPPER8__
#include "emu.h"
#include "peribox.h"
#include "ti99defs.h"
extern const device_type MAINBOARD8;

17
src/mess/mess.mak
View File

@ -563,6 +563,7 @@ BUSES += SEGA8
BUSES += SMS_CTRL
BUSES += SMS_EXP
BUSES += SNES
BUSES += TI99PEB
BUSES += TVC
BUSES += VCS
BUSES += VIC10
@ -1857,26 +1858,10 @@ $(MESSOBJ)/ti.a: \
$(MESS_MACHINE)/ti99/joyport.o \
$(MESS_MACHINE)/ti99/mecmouse.o \
$(MESS_MACHINE)/ti99/handset.o \
$(MESS_MACHINE)/ti99/peribox.o \
$(MESS_MACHINE)/ti99/ti32kmem.o \
$(MESS_MACHINE)/ti99/ti_fdc.o \
$(MESS_MACHINE)/ti99/bwg.o \
$(MESS_MACHINE)/ti99/hfdc.o \
$(MESS_MACHINE)/ti99/ti99_hd.o \
$(MESS_MACHINE)/ti99/p_code.o \
$(MESS_MACHINE)/ti99/myarcmem.o \
$(MESS_MACHINE)/ti99/samsmem.o \
$(MESS_MACHINE)/ti99/tn_ide.o \
$(MESS_MACHINE)/ti99/tn_usbsm.o \
$(MESS_MACHINE)/ti99/evpc.o \
$(MESS_MACHINE)/ti99/hsgpl.o\
$(MESS_MACHINE)/ti99/ti_rs232.o \
$(MESS_MACHINE)/ti99/spchsyn.o \
$(MESS_MACHINE)/ti99/speech8.o \
$(MESS_MACHINE)/ti99/mapper8.o \
$(MESS_MACHINE)/ti99/genboard.o \
$(MESS_MACHINE)/ti99/memex.o \
$(MESS_MACHINE)/ti99/horizon.o \
$(MESS_DRIVERS)/ti990_4.o \
$(MESS_DRIVERS)/ti99_4x.o \
$(MESS_DRIVERS)/ti99_4p.o \