Previous 15994 Revisions Next

r5262 Friday 17th July, 2009 at 10:03:06 UTC by Curt Coder
[ELF] Fixed switches.
[CDP1802] Fixed SC output and load mode.
[src/emu/cpu/cdp1802]cdp1802.c cdp1802.h
[src/mess/drivers]elf.c
[src/mess/includes]elf.h
[src/mess/machine]mm74c922.c
[src/mess/video]dm9368.c

src/emu/cpu/cdp1802/cdp1802.c
r5261r5262
4848
4949   /* cpu state */
5050   cdp1802_cpu_state state;      /* processor state */
51   cdp1802_state_code state_code;   /* state code */
5152   cdp1802_control_mode mode;      /* control mode */
5253   cdp1802_control_mode prevmode;   /* previous control mode */
5354
r5261r5262
101102   CDP1802_STATE_ENTRY(Re, "%04X", r[14], 0xffff, 0)
102103   CDP1802_STATE_ENTRY(Rf, "%04X", r[15], 0xffff, 0)
103104
105   CDP1802_STATE_ENTRY(SC, "%1u", state_code, 0x3, CPUSTATE_NOSHOW)
104106   CDP1802_STATE_ENTRY(DF, "%1u", df, 0x1, CPUSTATE_NOSHOW)
105107   CDP1802_STATE_ENTRY(IE, "%1u", ie, 0x1, CPUSTATE_NOSHOW)
106108   CDP1802_STATE_ENTRY(Q, "%1u", q, 0x1, CPUSTATE_NOSHOW)
r5261r5262
243245   if (cpustate->intf->sc_w)
244246   {
245247      cdp1802_state_code state_code = CDP1802_STATE_CODE_S0_FETCH;
248      int sc0, sc1;
246249
247250      switch (cpustate->state)
248251      {
r5261r5262
266269         break;
267270      }
268271
269      cpustate->intf->sc_w(device, state_code);
272      sc0 = BIT(state_code, 0);
273      sc1 = BIT(state_code, 1);
274
275      cpustate->intf->sc_w(device, state_code, sc0, sc1);
270276   }
271277}
272278
r5261r5262
274280{
275281   cdp1802_state *cpustate = get_safe_token(device);
276282
277   cdp1802_output_state_code(device);
278
279283   switch (cpustate->state)
280284   {
281285   case CDP1802_STATE_1_RESET:
r5261r5262
885889      switch (cpustate->mode)
886890      {
887891      case CDP1802_MODE_LOAD:
888         I = 0;
889         N = 0;
890         cpustate->state = CDP1802_STATE_1_EXECUTE;
891         cdp1802_run(device);
892         if (cpustate->prevmode == CDP1802_MODE_RESET)
893         {
894            cpustate->prevmode = CDP1802_MODE_LOAD;
895
896            /* execute initialization cycle */
897            cpustate->state = CDP1802_STATE_1_INIT;
898            cdp1802_run(device);
899           
900            /* next state is IDLE */
901            cpustate->state = CDP1802_STATE_1_EXECUTE;
902         }
903         else
904         {
905            /* idle */
906            I = 0;
907            N = 0;
908            cdp1802_run(device);
909         }
892910         break;
893911
894912      case CDP1802_MODE_RESET:
r5261r5262
905923         {
906924         case CDP1802_MODE_LOAD:
907925            // RUN mode cannot be initiated from LOAD mode
926            logerror("CDP1802 '%s' Tried to initiate RUN mode from LOAD mode\n", device->tag);
908927            cpustate->mode = CDP1802_MODE_LOAD;
909928            break;
910929
r5261r5262
926945         }
927946         break;
928947      }
948
949      cdp1802_output_state_code(device);
929950   }
930951   while (cpustate->icount > 0);
931952
src/emu/cpu/cdp1802/cdp1802.h
r5261r5262
4646
4747enum _cdp1802_state_code
4848{
49   CDP1802_STATE_CODE_S0_FETCH,
49   CDP1802_STATE_CODE_S0_FETCH = 0,
5050   CDP1802_STATE_CODE_S1_EXECUTE,
5151   CDP1802_STATE_CODE_S2_DMA,
5252   CDP1802_STATE_CODE_S3_INTERRUPT
r5261r5262
5858   CDP1802_P, CDP1802_X, CDP1802_D, CDP1802_B, CDP1802_T,
5959   CDP1802_R0, CDP1802_R1, CDP1802_R2, CDP1802_R3, CDP1802_R4, CDP1802_R5, CDP1802_R6, CDP1802_R7,
6060   CDP1802_R8, CDP1802_R9, CDP1802_Ra, CDP1802_Rb, CDP1802_Rc, CDP1802_Rd, CDP1802_Re, CDP1802_Rf,
61   CDP1802_DF, CDP1802_IE, CDP1802_Q, CDP1802_N, CDP1802_I,
61   CDP1802_DF, CDP1802_IE, CDP1802_Q, CDP1802_N, CDP1802_I, CDP1802_SC,
6262   CDP1802_GENPC = REG_GENPC
6363};
6464
r5261r5262
6868typedef UINT8 (*cdp1802_ef_read_func)(const device_config *device);
6969#define CDP1802_EF_READ(name) UINT8 name(const device_config *device)
7070
71typedef void (*cdp1802_sc_write_func)(const device_config *device, cdp1802_state_code state);
72#define CDP1802_SC_WRITE(name) void name(const device_config *device, cdp1802_state_code state)
71typedef void (*cdp1802_sc_write_func)(const device_config *device, cdp1802_state_code state, int sc0, int sc1);
72#define CDP1802_SC_WRITE(name) void name(const device_config *device, cdp1802_state_code state, int sc0, int sc1)
7373
7474/* interface */
7575typedef struct _cdp1802_interface cdp1802_interface;
src/mess/video/dm9368.c
r5261r5262
7070
7171   if (!dm9368->rbi && !a)
7272   {
73      if (LOG) logerror("DM9368 '%s' Blanked Rippling Zero\n", device->tag);
74
7375      /* blank rippling 0 */
7476      output_set_digit_value(dm9368->digit, 0);
7577
r5261r5262
8082   }
8183   else
8284   {
83      output_set_digit_value(dm9368->digit, ~OUTPUT[a]);
85      if (LOG) logerror("DM9368 '%s' Output Data: %u = %02x\n", device->tag, a, OUTPUT[a]);
8486
87      output_set_digit_value(dm9368->digit, OUTPUT[a]);
88
8589      if (dm9368->rbo_device)
8690      {
8791         dm9368_rbi_w(dm9368->rbo_device, 1);
r5261r5262
98102   dm9368_t *dm9368 = get_safe_token(device);
99103
100104   dm9368->rbi = state;
105
106   if (LOG) logerror("DM9368 '%s' Ripple Blanking Input: %u\n", device->tag, state);
101107}
102108
103109/*-------------------------------------------------
src/mess/includes/elf.h
r5261r5262
99#define DM9368_H_TAG   "a8"
1010#define CASSETTE_TAG   "cassette"
1111
12typedef struct _elf_state elf_state;
13struct _elf_state
12typedef struct _elf2_state elf2_state;
13struct _elf2_state
1414{
15   /* keyboard state */
16   int keylatch;
17
1815   /* display state */
1916   int cdp1861_efx;            /* EFx */
17   UINT8 data;
2018
2119   /* devices */
2220   const device_config *cdp1861;
src/mess/machine/mm74c922.c
r5261r5262
77
88**********************************************************************/
99
10/*
11
12   TODO:
13   
14   - update frequency from interface capacitor value
15   - debounce from interface capacitor value
16
17*/
18
1019#include "driver.h"
1120#include "mm74c922.h"
1221
r5261r5262
1423    PARAMETERS
1524***************************************************************************/
1625
17#define LOG 1
26#define LOG
1827
1928/***************************************************************************
2029    TYPE DEFINITIONS
r5261r5262
2635   devcb_resolved_read8      in_x_func[5];
2736   devcb_resolved_write_line   out_da_func;
2837
29   int inhibit;               /* scan counter clock inhibit */
30   int x;                     /* currently scanned column */
31   int y;                     /* latched row */
32   int max_y;                  /* number of rows */
38   int inhibit;            /* scan counter clock inhibit */
39   int x;                  /* currently scanned column */
40   int y;                  /* latched row */
41   int max_y;               /* number of rows */
3342
34   UINT8 data;                  /* data latch */
43   UINT8 data;               /* data latch */
3544
36   int da;                     /* data available flag */
37   int next_da;               /* next value of data available flag */
45   int da;                  /* data available flag */
46   int next_da;            /* next value of data available flag */
3847
3948   /* timers */
40   emu_timer *scan_timer;         /* keyboard scan timer */
49   emu_timer *scan_timer;      /* keyboard scan timer */
4150};
4251
4352/***************************************************************************
src/mess/drivers/elf.c
r5261r5262
11/***************************************************************************
22
3    Netronics Elf-II
3    Netronics Elf II
44
55****************************************************************************/
66
r5261r5262
88
99   TODO:
1010
11   - keyboard
12   - Q led
13   - DMAIN
14   - memory protect
15   - 7 segment displays
11   - proper layout
1612
1713*/
1814
r5261r5262
2016#include "includes/elf.h"
2117#include "cpu/cdp1802/cdp1802.h"
2218#include "devices/cassette.h"
19#include "devices/snapquik.h"
2320#include "machine/mm74c922.h"
2421#include "video/cdp1861.h"
2522#include "video/dm9368.h"
2623#include "machine/rescap.h"
2724#include "elf2.lh"
2825
26#define RUN(_machine)            BIT(input_port_read((_machine), "SPECIAL"), 0)
27#define LOAD(_machine)            BIT(input_port_read((_machine), "SPECIAL"), 1)
28#define MEMORY_PROTECT(_machine)   BIT(input_port_read((_machine), "SPECIAL"), 2)
29#define INPUT(_machine)            BIT(input_port_read((_machine), "SPECIAL"), 3)
30
31static QUICKLOAD_LOAD( elf );
32
2933/* Read/Write Handlers */
3034
31static WRITE8_HANDLER( digit_w )
35static READ8_DEVICE_HANDLER( dispon_r )
3236{
33//   elf_state *state = space->machine->driver_data;
37   cdp1861_dispon_w(device, 1);
38   cdp1861_dispon_w(device, 0);
3439
35   output_set_digit_value(0, 0xff);
36   output_set_digit_value(1, 0xff);
40   return 0xff;
3741}
3842
43static READ8_HANDLER( data_r )
44{
45   elf2_state *state = space->machine->driver_data;
46
47   return state->data;
48}
49
50static WRITE8_HANDLER( data_w )
51{
52   elf2_state *state = space->machine->driver_data;
53
54   dm9368_w(state->dm9368_l, 0, data & 0x0f);
55   dm9368_w(state->dm9368_h, 0, data >> 4);
56}
57
58static WRITE8_HANDLER( memory_w )
59{
60   elf2_state *state = space->machine->driver_data;
61
62   if (LOAD(space->machine))
63   {
64      if (MEMORY_PROTECT(space->machine))
65      {
66         /* latch data from memory */
67         data = mess_ram[offset];
68      }
69      else
70      {
71         /* write latched data to memory */
72         mess_ram[offset] = data;
73      }
74
75      /* write data to 7 segment displays */
76      dm9368_w(state->dm9368_l, 0, data & 0x0f);
77      dm9368_w(state->dm9368_h, 0, data >> 4);
78   }
79}
80
3981/* Memory Maps */
4082
4183static ADDRESS_MAP_START( elf2_mem, ADDRESS_SPACE_PROGRAM, 8 )
84   ADDRESS_MAP_UNMAP_HIGH
4285   ADDRESS_MAP_GLOBAL_MASK(0xff)
43   AM_RANGE(0x0000, 0x00ff) AM_RAM
86   AM_RANGE(0x0000, 0x00ff) AM_RAMBANK(1)
4487ADDRESS_MAP_END
4588
4689static ADDRESS_MAP_START( elf2_io, ADDRESS_SPACE_IO, 8 )
47//   AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(CDP1861_TAG, vip_cdp1861_dispon_r, vip_cdp1861_dispoff_w)
48   AM_RANGE(0x04, 0x04) AM_WRITE(digit_w)
90   ADDRESS_MAP_UNMAP_HIGH
91   AM_RANGE(0x01, 0x01) AM_DEVREAD(CDP1861_TAG, dispon_r)
92   AM_RANGE(0x04, 0x04) AM_READWRITE(data_r, data_w)
4993ADDRESS_MAP_END
5094
5195/* Input Ports */
r5261r5262
5498{
5599   if (newval)
56100   {
101      /* assert DMAIN */
57102      cputag_set_input_line(field->port->machine, CDP1802_TAG, CDP1802_INPUT_LINE_DMAIN, ASSERT_LINE);
58103   }
59104}
r5261r5262
91136   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("RUN") PORT_CODE(KEYCODE_R) PORT_TOGGLE
92137   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("LOAD") PORT_CODE(KEYCODE_L) PORT_TOGGLE
93138   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("M/P") PORT_CODE(KEYCODE_M) PORT_TOGGLE
94   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("INPUT") PORT_CODE(KEYCODE_R) PORT_CHANGED(input_w, 0)
139   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("INPUT") PORT_CODE(KEYCODE_ENTER) PORT_CHANGED(input_w, 0)
95140INPUT_PORTS_END
96141
97142/* CDP1802 Configuration */
98143
99144static CDP1802_MODE_READ( elf2_mode_r )
100145{
101//   elf_state *state = device->machine->driver_data;
102
103   UINT8 special = input_port_read(device->machine, "SPECIAL");
104   int run = BIT(special, 0);
105   int load = !BIT(special, 1);
106146   cdp1802_control_mode mode = CDP1802_MODE_RESET;
107147
108   switch ((run << 1) | load)
148   switch ((RUN(device->machine) << 1) | !LOAD(device->machine))
109149   {
110   case 0: mode = CDP1802_MODE_LOAD; break;
111   case 1: mode = CDP1802_MODE_RESET; break;
112   case 2: mode = CDP1802_MODE_PAUSE; break;
113   case 3: mode = CDP1802_MODE_RUN; break;
150   case 0: mode = CDP1802_MODE_LOAD;   popmessage("LOAD");      break;
151   case 1: mode = CDP1802_MODE_RESET;   popmessage("RESET");   break;
152   case 2: mode = CDP1802_MODE_PAUSE;   popmessage("PAUSE");   break;
153   case 3: mode = CDP1802_MODE_RUN;   popmessage("RUN");      break;
114154   }
115155
116156   return mode;
r5261r5262
122162        EF1     CDP1861
123163        EF2     
124164        EF3     
125        EF4     
165        EF4     input switch
126166    */
127167
128   elf_state *state = device->machine->driver_data;
168   elf2_state *state = device->machine->driver_data;
129169
130170   UINT8 flags = 0x0f;
131171
132172   /* CDP1861 */
133173   if (state->cdp1861_efx) flags -= EF1;
134174
175   /* input switch */
176   if (!INPUT(device->machine)) flags -= EF4;
177
135178   return flags;
136179}
137180
138181static CDP1802_SC_WRITE( elf2_sc_w )
139182{
140//   elf_state *driver_state = device->machine->driver_data;
141
142   if (state == CDP1802_STATE_CODE_S2_DMA)
183   if (sc1)
143184   {
144      // DMA acknowledge clears the DMAOUT request
185      /* clear DMAIN */
145186      cputag_set_input_line(device->machine, CDP1802_TAG, CDP1802_INPUT_LINE_DMAIN, CLEAR_LINE);
146187   }
147188}
r5261r5262
153194
154195static READ8_DEVICE_HANDLER( elf2_dma_r )
155196{
156//   elf_state *state = device->machine->driver_data;
197   elf2_state *state = device->machine->driver_data;
157198
158   return 0;
199   return state->data;
159200}
160201
161202static WRITE8_DEVICE_HANDLER( elf2_dma_w )
162203{
163   elf_state *state = device->machine->driver_data;
204   elf2_state *state = device->machine->driver_data;
164205
165206   cdp1861_dma_w(state->cdp1861, data);
166207}
r5261r5262
179220
180221static WRITE_LINE_DEVICE_HANDLER( mm74c923_da_w )
181222{
223   elf2_state *driver_state = device->machine->driver_data;
224
225   if (state)
226   {
227      /* shift keyboard data to latch */
228      driver_state->data <<= 4;
229      driver_state->data |= mm74c922_r(device, 0) & 0x0f;
230
231      if (LOAD(device->machine))
232      {
233         /* write data to 7 segment displays */
234         dm9368_w(driver_state->dm9368_l, 0, driver_state->data & 0x0f);
235         dm9368_w(driver_state->dm9368_h, 0, driver_state->data >> 4);
236      }
237   }
182238}
183239
184240static MM74C922_INTERFACE( keyboard_intf )
r5261r5262
197253
198254static VIDEO_UPDATE( elf2 )
199255{
200   elf_state *state = screen->machine->driver_data;
256   elf2_state *state = screen->machine->driver_data;
201257
202258   cdp1861_update(state->cdp1861, bitmap, cliprect);
203259
r5261r5262
206262
207263static WRITE_LINE_DEVICE_HANDLER( elf2_efx_w )
208264{
209   elf_state *driver_state = device->machine->driver_data;
265   elf2_state *driver_state = device->machine->driver_data;
210266
211267   driver_state->cdp1861_efx = state;
212268}
r5261r5262
224280
225281static MACHINE_START( elf2 )
226282{
227   elf_state *state = machine->driver_data;
283   elf2_state *state = machine->driver_data;
284   const address_space *program = cputag_get_address_space(machine, CDP1802_TAG, ADDRESS_SPACE_PROGRAM);
228285
229286   /* find devices */
230287   state->cdp1861 = devtag_get_device(machine, CDP1861_TAG);
r5261r5262
233290   state->dm9368_h = devtag_get_device(machine, DM9368_H_TAG);
234291   state->cassette = devtag_get_device(machine, CASSETTE_TAG);
235292
293   /* initialize LED displays */
294   dm9368_rbi_w(state->dm9368_l, 1);
295   dm9368_rbi_w(state->dm9368_h, 1);
296
297   /* setup memory banking */
298   memory_install_readwrite8_handler(program, 0x0000, 0x00ff, 0, 0, SMH_BANK(1), memory_w);
299   memory_configure_bank(machine, 1, 0, 1, mess_ram, 0);
300   memory_set_bank(machine, 1, 0);
301
236302   /* register for state saving */
237//   state_save_register_global(machine, state->);
303   state_save_register_global(machine, state->cdp1861_efx);
304   state_save_register_global(machine, state->data);
238305}
239306
240307/* Machine Driver */
r5261r5262
247314};
248315
249316static MACHINE_DRIVER_START( elf2 )
250   MDRV_DRIVER_DATA(elf_state)
317   MDRV_DRIVER_DATA(elf2_state)
251318
252319   /* basic machine hardware */
253320    MDRV_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_579545MHz/2)
r5261r5262
274341
275342   /* devices */
276343   MDRV_CASSETTE_ADD(CASSETTE_TAG, elf_cassette_config)
344   MDRV_QUICKLOAD_ADD("quickload", elf, "bin", 0)
277345MACHINE_DRIVER_END
278346
279347/* ROMs */
r5261r5262
284352
285353/* System Configuration */
286354
355static QUICKLOAD_LOAD( elf )
356{
357   int size = image_length(image);
358
359   if (size > mess_ram_size)
360   {
361      return INIT_FAIL;
362   }
363
364   image_fread(image, mess_ram, size);
365
366   return INIT_PASS;
367}
368
287369static SYSTEM_CONFIG_START( elf2 )
288   CONFIG_RAM_DEFAULT( 1 * 1024 )
370   CONFIG_RAM_DEFAULT( 256 )
289371SYSTEM_CONFIG_END
290372
291373/* System Drivers */
292374
293375/*    YEAR   NAME   PARENT   COMPAT   MACHINE   INPUT   INIT   CONFIG   COMPANY         FULLNAME   FLAGS */
294COMP( 1978, elf2,   0,      0,      elf2,   elf2,   0,      elf2,   "Netronics",   "Elf-II",   GAME_NOT_WORKING )
376COMP( 1978, elf2,   0,      0,      elf2,   elf2,   0,      elf2,   "Netronics",   "Elf II",   GAME_NOT_WORKING )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team