summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2011-01-21 20:50:43 +0000
committer Couriersud <couriersud@users.noreply.github.com>2011-01-21 20:50:43 +0000
commitc05c95920348598d70bfc6d55a713e051fdae237 (patch)
treecbbb45e21f5ffc62cb8027ed62fcd45d462f87d4
parent5076278e612f04b2edfa713c49fe559c927ccdc9 (diff)
Added serial interface to gaelco3d hardware. In machine/gaelco3d there are instructions on how to compile and run two synchronized instances of mame to play gaelco3d games. This requires shared memory and currently only works on UNIX. It is disabled by default.
This is a proof-of-concept commit. It works but is far from stable. Synchronization between two mame processes is *somehow* (trying to avoid hacked) in. However, this is not HLE. Shared memory is used to share the serial interface lines. If the shared memory code is not enable, stub functions are used. If you set the link mode to master or slave, "not linked" will be shown in the game. That's better than the previous hang. Please, no whatsnew.
-rw-r--r--.gitattributes2
-rw-r--r--src/mame/drivers/gaelco3d.c107
-rw-r--r--src/mame/machine/gaelco3d.c549
-rw-r--r--src/mame/machine/gaelco3d.h73
-rw-r--r--src/mame/mame.mak2
5 files changed, 696 insertions, 37 deletions
diff --git a/.gitattributes b/.gitattributes
index 1bb2219a073..50404b6a7a7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3470,6 +3470,8 @@ src/mame/machine/fddebug.c svneol=native#text/plain
src/mame/machine/fddebug.h svneol=native#text/plain
src/mame/machine/flstory.c svneol=native#text/plain
src/mame/machine/gaelco2.c svneol=native#text/plain
+src/mame/machine/gaelco3d.c svneol=native#text/plain
+src/mame/machine/gaelco3d.h svneol=native#text/plain
src/mame/machine/gaelcrpt.c svneol=native#text/plain
src/mame/machine/galaxold.c svneol=native#text/plain
src/mame/machine/gaplus.c svneol=native#text/plain
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index eec7f08385e..b0b97b0f3be 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -148,6 +148,7 @@ REF. 970429
#include "cpu/tms32031/tms32031.h"
#include "cpu/adsp2100/adsp2100.h"
#include "machine/eeprom.h"
+#include "machine/gaelco3d.h"
#include "sound/dmadac.h"
#define LOG 0
@@ -173,6 +174,22 @@ static dmadac_sound_device *dmadac[SOUND_CHANNELS];
static void adsp_tx_callback(adsp21xx_device &device, int port, INT32 data);
+static WRITE_LINE_DEVICE_HANDLER( ser_irq )
+{
+ if (state)
+ cputag_set_input_line(device->machine, "maincpu", 6, ASSERT_LINE);
+ else
+ cputag_set_input_line(device->machine, "maincpu", 6, CLEAR_LINE);
+}
+
+
+static const gaelco_serial_interface serial_interface =
+{
+ DEVCB_LINE( ser_irq )
+};
+
+
+
/*************************************
*
@@ -260,17 +277,36 @@ static WRITE16_HANDLER( irq_ack_w )
cputag_set_input_line(space->machine, "maincpu", 2, CLEAR_LINE);
}
+static WRITE32_HANDLER( irq_ack32_w )
+{
+ if (mem_mask == 0xffff0000)
+ irq_ack_w(space, offset, data, mem_mask >> 16);
+ else if (ACCESSING_BITS_0_7)
+ gaelco_serial_tr_w(space->machine->device("serial"), 0, data & 0x01);
+ else
+ logerror("%06X:irq_ack_w(%02X) = %08X & %08X\n", cpu_get_pc(space->cpu), offset, data, mem_mask);
+}
/*************************************
*
* EEPROM (93C66B)
+ * Serial Interface
*
*************************************/
static READ16_DEVICE_HANDLER( eeprom_data_r )
{
- UINT16 result = 0xffff;
+ UINT32 result = 0xffff;
+
+ if (ACCESSING_BITS_0_7)
+ {
+ /* bit 0 is clock */
+ /* bit 1 active */
+ result &= ~GAELCOSER_EXT_STATUS_MASK;
+ result |= gaelco_serial_status_r(device->machine->device("serial"), 0);
+ }
+
if (eeprom_read_bit(device))
result ^= 0x0004;
if (LOG)
@@ -278,11 +314,30 @@ static READ16_DEVICE_HANDLER( eeprom_data_r )
return result;
}
+static READ32_DEVICE_HANDLER( eeprom_data32_r )
+{
+ if (ACCESSING_BITS_16_31)
+ return (eeprom_data_r(device, 0, mem_mask >> 16) << 16) | 0xffff;
+ else if (ACCESSING_BITS_0_7)
+ {
+ UINT8 data = gaelco_serial_data_r(device->machine->device("serial"),0);
+ if (LOG)
+ logerror("%06X:read(%02X) = %08X & %08X\n", cpu_get_pc(device->machine->device("maincpu")), offset, data, mem_mask);
+ return data | 0xffffff00;
+ }
+ else
+ logerror("%06X:read(%02X) = mask %08X\n", cpu_get_pc(device->machine->device("maincpu")), offset, mem_mask);
+
+ return 0xffffffff;
+}
+
static WRITE16_DEVICE_HANDLER( eeprom_data_w )
{
if (ACCESSING_BITS_0_7)
eeprom_write_bit(device, data & 0x01);
+ else if (mem_mask != 0xffff)
+ logerror("write mask: %08x data %08x\n", mem_mask, data);
}
@@ -673,16 +728,8 @@ static void adsp_tx_callback(adsp21xx_device &device, int port, INT32 data)
*
*************************************/
-static WRITE32_HANDLER( unknown_107_w )
-{
- /* arbitrary data written */
- if (ACCESSING_BITS_0_7)
- logerror("%06X:unknown_107_w = %02X\n", cpu_get_pc(space->cpu), data & 0xff);
- else
- logerror("%06X:unknown_107_w(%02X) = %08X & %08X\n", cpu_get_pc(space->cpu), offset, data, mem_mask);
-}
-static WRITE32_HANDLER( unknown_127_w )
+static WRITE32_HANDLER( radikalb_lamp_w )
{
/* arbitrary data written */
if (ACCESSING_BITS_0_7)
@@ -710,23 +757,6 @@ static WRITE32_HANDLER( unknown_13a_w )
}
-static WRITE16_HANDLER( led_0_w )
-{
- /* this has $00 written during an IRQ 6, then reset to $ff afterwards */
- /* LED??? */
- if (ACCESSING_BITS_0_7)
- set_led_status(space->machine, 0, data != 0);
-}
-
-
-static WRITE16_HANDLER( led_1_w )
-{
- /* LED??? -- only written $00 or $ff */
- if (ACCESSING_BITS_0_7)
- set_led_status(space->machine, 1, data != 0);
-}
-
-
/*************************************
*
@@ -746,17 +776,20 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x510042, 0x510043) AM_READ(sound_status_r)
AM_RANGE(0x510100, 0x510101) AM_DEVREAD("eeprom", eeprom_data_r)
AM_RANGE(0x510100, 0x510101) AM_WRITE(irq_ack_w)
- AM_RANGE(0x51010a, 0x51010b) AM_WRITENOP // very noisy when starting a new game
+ AM_RANGE(0x510102, 0x510103) AM_DEVWRITE8("serial", gaelco_serial_tr_w, 0x00ff)
+ AM_RANGE(0x510102, 0x510103) AM_DEVREAD8("serial", gaelco_serial_data_r, 0x00ff)
+ AM_RANGE(0x510104, 0x510105) AM_DEVWRITE8("serial", gaelco_serial_data_w, 0x00ff)
+ AM_RANGE(0x51010a, 0x51010b) AM_DEVWRITE8("serial", gaelco_serial_rts_w, 0x00ff)
AM_RANGE(0x510110, 0x510113) AM_DEVWRITE("eeprom", eeprom_data_w)
AM_RANGE(0x510116, 0x510117) AM_WRITE(tms_control3_w)
AM_RANGE(0x510118, 0x51011b) AM_DEVWRITE("eeprom", eeprom_clock_w)
AM_RANGE(0x510120, 0x510123) AM_DEVWRITE("eeprom", eeprom_cs_w)
AM_RANGE(0x51012a, 0x51012b) AM_WRITE(tms_reset_w)
AM_RANGE(0x510132, 0x510133) AM_WRITE(tms_irq_w)
- AM_RANGE(0x510146, 0x510147) AM_WRITE(led_0_w)
+ AM_RANGE(0x510146, 0x510147) AM_DEVWRITE8("serial", gaelco_serial_irq_enable, 0x00ff)
AM_RANGE(0x510156, 0x510157) AM_WRITE(analog_port_clock_w)
AM_RANGE(0x510166, 0x510167) AM_WRITE(analog_port_latch_w)
- AM_RANGE(0x510176, 0x510177) AM_WRITE(led_1_w)
+ AM_RANGE(0x510176, 0x510177) AM_DEVWRITE8("serial", gaelco_serial_unknown_w, 0x00ff)
AM_RANGE(0xfe7f80, 0xfe7fff) AM_WRITE(tms_comm_w) AM_BASE(&tms_comm_base)
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM AM_BASE(&m68k_ram_base)
ADDRESS_MAP_END
@@ -771,22 +804,23 @@ static ADDRESS_MAP_START( main020_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x51003c, 0x51003f) AM_READ_PORT("IN3")
AM_RANGE(0x510040, 0x510043) AM_READ16(sound_status_r, 0x0000ffff)
AM_RANGE(0x510040, 0x510043) AM_WRITE16(sound_data_w, 0xffff0000)
- AM_RANGE(0x510100, 0x510103) AM_DEVREAD16("eeprom", eeprom_data_r, 0xffff0000)
- AM_RANGE(0x510100, 0x510103) AM_WRITE16(irq_ack_w, 0xffff0000)
- AM_RANGE(0x510104, 0x510107) AM_WRITE(unknown_107_w)
+ AM_RANGE(0x510100, 0x510103) AM_DEVREAD("eeprom", eeprom_data32_r)
+ AM_RANGE(0x510100, 0x510103) AM_WRITE(irq_ack32_w)
+ AM_RANGE(0x510104, 0x510107) AM_DEVWRITE8("serial", gaelco_serial_data_w, 0x00ff0000)
+ AM_RANGE(0x510108, 0x51010b) AM_DEVWRITE8("serial", gaelco_serial_rts_w, 0x000000ff)
AM_RANGE(0x510110, 0x510113) AM_DEVWRITE16("eeprom", eeprom_data_w, 0x0000ffff)
AM_RANGE(0x510114, 0x510117) AM_WRITE16(tms_control3_w, 0x0000ffff)
AM_RANGE(0x510118, 0x51011b) AM_DEVWRITE16("eeprom", eeprom_clock_w, 0x0000ffff)
AM_RANGE(0x510120, 0x510123) AM_DEVWRITE16("eeprom", eeprom_cs_w, 0x0000ffff)
- AM_RANGE(0x510124, 0x510127) AM_WRITE(unknown_127_w)
+ AM_RANGE(0x510124, 0x510127) AM_WRITE(radikalb_lamp_w)
AM_RANGE(0x510128, 0x51012b) AM_WRITE16(tms_reset_w, 0x0000ffff)
AM_RANGE(0x510130, 0x510133) AM_WRITE16(tms_irq_w, 0x0000ffff)
AM_RANGE(0x510134, 0x510137) AM_WRITE(unknown_137_w)
AM_RANGE(0x510138, 0x51013b) AM_WRITE(unknown_13a_w)
- AM_RANGE(0x510144, 0x510147) AM_WRITE16(led_0_w, 0x0000ffff)
+ AM_RANGE(0x510144, 0x510147) AM_DEVWRITE8("serial", gaelco_serial_irq_enable, 0x000000ff)
AM_RANGE(0x510154, 0x510157) AM_WRITE16(analog_port_clock_w, 0x0000ffff)
AM_RANGE(0x510164, 0x510167) AM_WRITE16(analog_port_latch_w, 0x0000ffff)
- AM_RANGE(0x510174, 0x510177) AM_WRITE16(led_1_w, 0x0000ffff)
+ AM_RANGE(0x510174, 0x510177) AM_DEVWRITE8("serial", gaelco_serial_unknown_w, 0x000000ff)
AM_RANGE(0xfe7f80, 0xfe7fff) AM_WRITE16(tms_comm_w, 0xffffffff) AM_BASE((UINT32 **)&tms_comm_base)
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM AM_BASE((UINT32 **)&m68k_ram_base)
ADDRESS_MAP_END
@@ -977,6 +1011,7 @@ static MACHINE_CONFIG_START( gaelco3d, driver_device )
MCFG_QUANTUM_TIME(HZ(6000))
MCFG_TIMER_ADD("adsp_timer", adsp_autobuffer_irq)
+ MCFG_GAELCO_SERIAL_ADD("serial", 0, serial_interface)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/machine/gaelco3d.c b/src/mame/machine/gaelco3d.c
new file mode 100644
index 00000000000..59153394c69
--- /dev/null
+++ b/src/mame/machine/gaelco3d.c
@@ -0,0 +1,549 @@
+/***************************************************************************
+
+ Gaelco 3D serial hardware
+
+ Couriersud, early 2010
+
+ Not all lines are fully understood. There is some handshaking going
+ on on send which is not fully understood. Those wishing to have a look
+ at this:
+
+ Serial send: 0x1fca (radikalb, 68020) 1866e (surfplnt)
+ Serial receive: 0x1908 (radikalb, 68020) 185ae
+
+ The receive is interrupt driven (interrupt 6) and the send is
+ initiated out of the normal program loop. There is the chance
+ of race conditions in mame.
+
+ To run two instances of radikalb on *nix, use the following
+
+ a) Uncomment SHARED_MEM_DRIVER below
+ b) Open two terminals
+ c) In terminal 1: mkdir /tmp/x1; cd /tmp/x1; /path/to/mame64 -np 2 -mt -rp /mnt/mame/romlib/r -inipath . radikalb -w -nomaximize -inipath .
+ d) In terminal 2: mkdir /tmp/x2; cd /tmp/x2; /path/to/mame64 -np 2 -mt -rp /mnt/mame/romlib/r -inipath . radikalb -w -nomaximize -inipath .
+ e) Set one instance to be master and one to be slave in service mode
+ f) Have fun
+
+***************************************************************************/
+
+#include "emu.h"
+#include "gaelco3d.h"
+
+//#define SHARED_MEM_DRIVER (1)
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#ifdef SHARED_MEM_DRIVER
+#include <sys/mman.h>
+#endif
+
+#define VERBOSE (0)
+#if VERBOSE
+#define LOGMSG(x) logerror x
+#else
+#define LOGMSG(x) do {} while (0);
+#endif
+
+/*
+ * 115200 seems plausible, radikalb won't work below this speed
+ * surfplnt will not work below 460800 ....
+ * speedup will not work above 115200
+ * 10 bits = 8 data + 1 start + 1 stop
+ */
+
+#define LINK_BAUD (115200*4)
+//Only for speedup
+//#define LINK_BAUD (115200)
+#define LINK_BITS 10
+
+#define LINK_FREQ (LINK_BAUD / LINK_BITS)
+
+/* Sync up the instances 8 times for each byte transfered */
+#define SYNC_MULT (4)
+
+#define SYNC_FREQ (15000000 / 20) //(LINK_FREQ * SYNC_MULT)
+
+/* allow for slight differences in execution speed */
+
+#define LINK_SLACK ((SYNC_MULT / 4) + 1)
+#define LINK_SLACK_B ((LINK_SLACK / 3) + 1)
+
+
+typedef struct _buf_t buf_t;
+struct _buf_t
+{
+ volatile UINT8 data;
+ volatile UINT8 stat;
+ volatile int cnt;
+ volatile int data_cnt;
+};
+
+typedef struct _shmem_t shmem_t;
+struct _shmem_t
+{
+ volatile INT32 lock;
+ buf_t buf[2];
+};
+
+typedef struct _osd_shared_mem osd_shared_mem;
+
+typedef struct _gaelco_serial_state gaelco_serial_state;
+struct _gaelco_serial_state
+{
+ device_t *device;
+ devcb_resolved_write_line irq_func;
+
+ UINT8 status;
+ int last_in_msg_cnt;
+ int slack_cnt;
+
+ emu_timer *sync_timer;
+
+ buf_t *in_ptr;
+ buf_t *out_ptr;
+ osd_shared_mem *os_shmem;
+ shmem_t *shmem;
+};
+
+struct _osd_shared_mem
+{
+ char *fn;
+ size_t size;
+ void *ptr;
+ int creator;
+};
+
+/* code below currently works on unix only */
+#ifdef SHARED_MEM_DRIVER
+static osd_shared_mem *osd_sharedmem_alloc(const char *path, int create, size_t size)
+{
+ int fd;
+ osd_shared_mem *os_shmem = (osd_shared_mem *) osd_malloc(sizeof(osd_shared_mem));
+
+ if (create)
+ {
+ char *buf = (char *) osd_malloc(size);
+ memset(buf,0, size);
+
+ fd = open(path, O_RDWR | O_CREAT, S_IRWXU);
+ write(fd, buf, size);
+ os_shmem->creator = 1;
+
+ }
+ else
+ {
+ fd = open(path, O_RDWR);
+ if (fd == -1)
+ {
+ osd_free(os_shmem);
+ return NULL;
+ }
+ os_shmem->creator = 0;
+ }
+ os_shmem->fn = (char *) osd_malloc(strlen(path)+1);
+ strcpy(os_shmem->fn, path);
+
+ assert(fd != -1);
+
+ os_shmem->ptr = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+ os_shmem->size =size;
+ close(fd);
+ return os_shmem;
+}
+
+static void osd_sharedmem_free(osd_shared_mem *os_shmem)
+{
+ munmap(os_shmem->ptr, os_shmem->size);
+ if (os_shmem->creator)
+ unlink(os_shmem->fn);
+ osd_free(os_shmem->fn);
+ osd_free(os_shmem);
+}
+
+static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem)
+{
+ return os_shmem->ptr;
+}
+#else
+static osd_shared_mem *osd_sharedmem_alloc(const char *path, int create, size_t size)
+{
+ int fd;
+ osd_shared_mem *os_shmem = (osd_shared_mem *) osd_malloc(sizeof(osd_shared_mem));
+
+ if (create)
+ {
+ char *buf = (char *) osd_malloc(size);
+ memset(buf,0, size);
+
+ fd = open(path, O_RDWR | O_CREAT, S_IRWXU);
+ write(fd, buf, size);
+ os_shmem->creator = 1;
+
+ }
+ else
+ {
+ fd = open(path, O_RDWR);
+ if (fd == -1)
+ {
+ osd_free(os_shmem);
+ return NULL;
+ }
+ os_shmem->creator = 0;
+ }
+ os_shmem->fn = (char *) osd_malloc(strlen(path)+1);
+ strcpy(os_shmem->fn, path);
+
+ assert(fd != -1);
+
+ os_shmem->ptr = (void *) osd_malloc(size);
+ os_shmem->size =size;
+ close(fd);
+ return os_shmem;
+}
+
+static void osd_sharedmem_free(osd_shared_mem *os_shmem)
+{
+ osd_free(os_shmem->ptr);
+ if (os_shmem->creator)
+ unlink(os_shmem->fn);
+ osd_free(os_shmem->fn);
+ osd_free(os_shmem);
+}
+
+static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem)
+{
+ return os_shmem->ptr;
+}
+#endif
+
+/***************************************************************************
+ INLINE FUNCTIONS
+***************************************************************************/
+
+/*-------------------------------------------------
+ get_safe_token - convert a device's token
+ into a gaelco_serial_state
+-------------------------------------------------*/
+
+INLINE gaelco_serial_state *get_token(device_t *device)
+{
+ assert(device != NULL);
+ assert(device->type() == GAELCO_SERIAL);
+ return (gaelco_serial_state *) downcast<legacy_device_base *>(device)->token();
+}
+
+INLINE const gaelco_serial_interface *get_interface(device_t *device)
+{
+ assert(device != NULL);
+ assert(device->type() == GAELCO_SERIAL);
+ return (gaelco_serial_interface *) downcast<legacy_device_base *>(device)->baseconfig().static_config();
+}
+
+INLINE void shmem_lock(shmem_t *shmem)
+{
+ while (atomic_exchange32(&shmem->lock,1) == 0)
+ ;
+}
+
+INLINE void shmem_unlock(shmem_t *shmem)
+{
+ atomic_exchange32(&shmem->lock,0);
+}
+
+/***************************************************************************
+ STATIC FUNCTIONS
+***************************************************************************/
+
+
+static TIMER_CALLBACK( set_status_cb )
+{
+ gaelco_serial_state *state = (gaelco_serial_state *) ptr;
+ UINT8 mask = param >> 8;
+ UINT8 set = param & 0xff;
+
+ state->status &= mask;
+ state->status |= set;
+}
+
+static void set_status(gaelco_serial_state *state, UINT8 mask, UINT8 set, int wait)
+{
+ timer_set(state->device->machine, ATTOTIME_IN_HZ(wait),
+ state, (mask << 8)|set, set_status_cb);
+}
+
+static void process_in(gaelco_serial_state *state)
+{
+ int t;
+
+ if ((state->in_ptr->stat & GAELCOSER_STATUS_RESET) != 0)
+ state->out_ptr->cnt = 0;
+
+ /* new data available ? */
+ t = state->in_ptr->data_cnt;
+ if (t != state->last_in_msg_cnt)
+ {
+ state->last_in_msg_cnt = t;
+ if (state->in_ptr->cnt > 10)
+ {
+ state->status &= ~GAELCOSER_STATUS_READY;
+ LOGMSG(("command receive %02x at %d (%d)\n", state->in_ptr->data, state->out_ptr->cnt, state->in_ptr->cnt));
+ if ((state->status & GAELCOSER_STATUS_IRQ_ENABLE) != 0)
+ {
+ devcb_call_write_line(&state->irq_func, 1);
+ LOGMSG(("irq!\n"));
+ }
+ }
+ }
+}
+
+static void sync_link(gaelco_serial_state *state)
+{
+ volatile buf_t *buf = state->in_ptr;
+ int breakme = 1;
+ do
+ {
+ shmem_lock(state->shmem);
+ process_in(state);
+ /* HACK: put some timing noise on the line */
+ if (buf->cnt + state->slack_cnt > state->out_ptr->cnt)
+ breakme = 0;
+ /* stop if not connected .. */
+ if ((state->out_ptr->stat & GAELCOSER_STATUS_RESET) != 0)
+ breakme = 0;
+ shmem_unlock(state->shmem);
+ } while (breakme);
+
+ state->slack_cnt++;
+ state->slack_cnt = (state->slack_cnt % LINK_SLACK) + LINK_SLACK_B;
+
+ shmem_lock(state->shmem);
+ state->out_ptr->stat &= ~GAELCOSER_STATUS_RESET;
+ shmem_unlock(state->shmem);
+}
+
+static TIMER_CALLBACK( link_cb )
+{
+ gaelco_serial_state *state = (gaelco_serial_state *) ptr;
+
+ shmem_lock(state->shmem);
+ state->out_ptr->cnt++;
+ sync_link(state);
+ shmem_unlock(state->shmem);
+}
+
+
+/***************************************************************************
+ INTERFACE FUNCTIONS
+***************************************************************************/
+
+
+
+WRITE8_DEVICE_HANDLER( gaelco_serial_irq_enable )
+{
+ LOGMSG(("???? irq enable %d\n", data));
+}
+
+READ8_DEVICE_HANDLER( gaelco_serial_status_r)
+{
+ gaelco_serial_state *serial = get_token(device);
+ UINT8 ret = 0;
+
+ shmem_lock(serial->shmem);
+ process_in(serial);
+ if ((serial->status & GAELCOSER_STATUS_READY) != 0)
+ ret |= 0x01;
+ if ((serial->in_ptr->stat & GAELCOSER_STATUS_RTS) != 0)
+ ret |= 0x02;
+ return ret;
+ shmem_unlock(serial->shmem);
+}
+
+WRITE8_DEVICE_HANDLER( gaelco_serial_data_w)
+{
+ gaelco_serial_state *serial = get_token(device);
+
+ shmem_lock(serial->shmem);
+
+ serial->out_ptr->data = data;
+ serial->status &= ~GAELCOSER_STATUS_READY;
+ serial->out_ptr->data_cnt++;
+
+ set_status(serial, ~GAELCOSER_STATUS_READY, GAELCOSER_STATUS_READY, LINK_FREQ );
+
+ shmem_unlock(serial->shmem);
+ LOGMSG(("command send %02x at %d\n", data, serial->out_ptr->cnt));
+}
+
+READ8_DEVICE_HANDLER( gaelco_serial_data_r)
+{
+ gaelco_serial_state *serial = get_token(device);
+ UINT8 ret;
+
+ shmem_lock(serial->shmem);
+ process_in(serial);
+ ret = (serial->in_ptr->data & 0xff);
+
+ devcb_call_write_line(&serial->irq_func, 0);
+ LOGMSG(("read %02x at %d (%d)\n", ret, serial->out_ptr->cnt, serial->in_ptr->cnt));
+
+ /* if we are not sending, mark as as ready */
+ if ((serial->status & GAELCOSER_STATUS_SEND) == 0)
+ serial->status |= GAELCOSER_STATUS_READY;
+
+ shmem_unlock(serial->shmem);
+ return ret;
+}
+
+WRITE8_DEVICE_HANDLER( gaelco_serial_unknown_w)
+{
+ gaelco_serial_state *serial = get_token(device);
+
+ shmem_lock(serial->shmem);
+ LOGMSG(("???? unknown serial access %d\n", data));
+ shmem_unlock(serial->shmem);
+
+}
+
+WRITE8_DEVICE_HANDLER( gaelco_serial_rts_w )
+{
+ gaelco_serial_state *serial = get_token(device);
+
+ shmem_lock(serial->shmem);
+
+ if (data == 0)
+ serial->out_ptr->stat |= GAELCOSER_STATUS_RTS;
+ else
+ {
+ //Commented out for now
+ //serial->status |= GAELCOSER_STATUS_READY;
+ serial->out_ptr->stat &= ~GAELCOSER_STATUS_RTS;
+ }
+
+ shmem_unlock(serial->shmem);
+}
+
+WRITE8_DEVICE_HANDLER( gaelco_serial_tr_w)
+{
+ gaelco_serial_state *serial = get_token(device);
+
+ LOGMSG(("set transmit %d\n", data));
+ shmem_lock(serial->shmem);
+ if ((data & 0x01) != 0)
+ serial->status |= GAELCOSER_STATUS_SEND;
+ else
+ serial->status &= ~GAELCOSER_STATUS_SEND;
+
+ shmem_unlock(serial->shmem);
+}
+
+
+/***************************************************************************
+ DEVICE INTERFACE
+***************************************************************************/
+
+#define PATH_NAME "/tmp/gaelco_serial"
+
+static DEVICE_START( gaelco_serial )
+{
+ gaelco_serial_state *state = get_token(device);
+ const gaelco_serial_interface *intf = get_interface(device);
+
+ /* validate arguments */
+ assert(device != NULL);
+ assert(strlen(device->tag()) < 20);
+
+ /* clear out CIA structure, and copy the interface */
+ memset(state, 0, sizeof(*state));
+ state->device = device;
+
+ devcb_resolve_write_line(&state->irq_func, &intf->irq_func, device);
+ state->sync_timer = timer_alloc(device->machine, link_cb, state);
+
+ /* register for save states */
+ //state_save_register_device_item(device, 0, earom->offset);
+ //state_save_register_device_item(device, 0, earom->data);
+
+#ifdef SHARED_MEM_DRIVER
+ timer_adjust_periodic(state->sync_timer, attotime_zero,0,ATTOTIME_IN_HZ(SYNC_FREQ));
+#endif
+
+ state->os_shmem = osd_sharedmem_alloc(PATH_NAME, 0, sizeof(shmem_t));
+ if (state->os_shmem == NULL)
+ {
+ state->os_shmem = osd_sharedmem_alloc(PATH_NAME, 1, sizeof(shmem_t));
+ state->shmem = (shmem_t *) osd_sharedmem_ptr(state->os_shmem);
+
+ state->in_ptr = &state->shmem->buf[0];
+ state->out_ptr = &state->shmem->buf[1];
+ }
+ else
+ {
+ state->shmem = (shmem_t *) osd_sharedmem_ptr(state->os_shmem);
+ state->in_ptr = &state->shmem->buf[1];
+ state->out_ptr = &state->shmem->buf[0];
+ }
+}
+
+static void buf_reset(buf_t *buf)
+{
+ buf->stat = GAELCOSER_STATUS_RTS| GAELCOSER_STATUS_RESET;
+ buf->data = 0;
+ buf->data_cnt = -1;
+ buf->cnt = 0;
+}
+
+static DEVICE_RESET( gaelco_serial )
+{
+ gaelco_serial_state *state = get_token(device);
+
+ state->status = GAELCOSER_STATUS_READY |GAELCOSER_STATUS_IRQ_ENABLE ;
+
+ state->last_in_msg_cnt = -1;
+ state->slack_cnt = LINK_SLACK_B;
+
+ shmem_lock(state->shmem);
+ buf_reset(state->out_ptr);
+ buf_reset(state->in_ptr);
+ shmem_unlock(state->shmem);
+}
+
+static DEVICE_STOP( gaelco_serial )
+{
+ gaelco_serial_state *state = get_token(device);
+
+ shmem_lock(state->shmem);
+ buf_reset(state->out_ptr);
+ buf_reset(state->in_ptr);
+ shmem_unlock(state->shmem);
+
+ osd_sharedmem_free(state->os_shmem);
+}
+
+DEVICE_GET_INFO( gaelco_serial )
+{
+ switch (state)
+ {
+ /* --- the following bits of info are returned as 64-bit signed integers --- */
+ case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gaelco_serial_state); break;
+ case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = 0; break;
+ //case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break;
+
+ /* --- the following bits of info are returned as pointers to data or functions --- */
+ case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(gaelco_serial);break;
+ case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(gaelco_serial);break;
+ case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(gaelco_serial);break;
+
+ /* --- the following bits of info are returned as NULL-terminated strings --- */
+ case DEVINFO_STR_NAME: strcpy(info->s, "gaelco_serial"); break;
+ case DEVINFO_STR_FAMILY: strcpy(info->s, "SERIAL"); break;
+ case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
+ case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+ }
+}
+
+
+DEFINE_LEGACY_DEVICE(GAELCO_SERIAL, gaelco_serial);
diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h
new file mode 100644
index 00000000000..7bd59a4acf4
--- /dev/null
+++ b/src/mame/machine/gaelco3d.h
@@ -0,0 +1,73 @@
+/***************************************************************************
+
+ Gaelco 3D serial hardware
+
+***************************************************************************/
+
+
+
+/***************************************************************************
+ DEVICE CONFIGURATION MACROS
+***************************************************************************/
+
+#define MCFG_GAELCO_SERIAL_ADD(_tag, _clock, _intrf) \
+ MCFG_DEVICE_ADD(_tag, GAELCO_SERIAL, _clock) \
+ MCFG_DEVICE_CONFIG(_intrf)
+
+/* external status bits */
+#define GAELCOSER_STATUS_READY 0x01
+#define GAELCOSER_STATUS_RTS 0x02
+
+/* only RTS currently understood ! */
+//#define GAELCOSER_STATUS_DTR 0x04
+
+#define GAELCOSER_EXT_STATUS_MASK 0x03
+
+/* internal bits follow ... */
+#define GAELCOSER_STATUS_IRQ_ENABLE 0x10
+#define GAELCOSER_STATUS_RESET 0x20
+#define GAELCOSER_STATUS_SEND 0x40
+
+
+
+/***************************************************************************
+ DEVICE INTERFACE TYPE
+***************************************************************************/
+
+typedef struct _gaelco_serial_interface gaelco_serial_interface;
+struct _gaelco_serial_interface
+{
+ devcb_write_line irq_func;
+};
+
+
+/***************************************************************************
+ FUNCTION PROTOTYPES
+***************************************************************************/
+
+READ8_DEVICE_HANDLER( gaelco_serial_status_r);
+WRITE8_DEVICE_HANDLER( gaelco_serial_data_w);
+READ8_DEVICE_HANDLER( gaelco_serial_data_r);
+WRITE8_DEVICE_HANDLER( gaelco_serial_rts_w );
+/* Set to 1 during transmit, 0 for receive */
+WRITE8_DEVICE_HANDLER( gaelco_serial_tr_w);
+
+
+/* Big questions marks, related to serial i/o */
+
+/* Not used in surfplnt, but in radikalb
+ * Set at beginning of transfer sub, cleared at end
+ */
+WRITE8_DEVICE_HANDLER( gaelco_serial_unknown_w);
+
+
+/* only used in radikalb, set at beginning of receive isr, cleared at end */
+WRITE8_DEVICE_HANDLER( gaelco_serial_irq_enable );
+
+
+
+/* ----- device interface ----- */
+
+DECLARE_LEGACY_DEVICE(GAELCO_SERIAL, gaelco_serial);
+
+//DEVICE_GET_INFO( gaelco_serial );
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 86e2eb680b5..0339b66e36c 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -667,7 +667,7 @@ $(MAMEOBJ)/gaelco.a: \
$(DRIVERS)/atvtrack.o \
$(DRIVERS)/gaelco.o $(VIDEO)/gaelco.o $(MACHINE)/gaelcrpt.o \
$(DRIVERS)/gaelco2.o $(MACHINE)/gaelco2.o $(VIDEO)/gaelco2.o \
- $(DRIVERS)/gaelco3d.o $(VIDEO)/gaelco3d.o \
+ $(DRIVERS)/gaelco3d.o $(VIDEO)/gaelco3d.o $(MACHINE)/gaelco3d.o\
$(DRIVERS)/glass.o $(VIDEO)/glass.o \
$(DRIVERS)/mastboy.o \
$(DRIVERS)/splash.o $(VIDEO)/splash.o \