Previous 15994 Revisions Next

r13625 Monday 19th December, 2011 at 09:23:43 UTC by Curt Coder
[APRICOTF] Reorganization. (nw)
[src/mess]mess.mak mess_dev.lst
[src/mess/drivers]apricotf.c apricotp.c*
[src/mess/includes]apricotf.h apricotp.h*
[src/mess/machine]apricotkb.c* apricotkb.h*

src/mess/machine/apricotkb.c
r0r13625
1#include "apricotkb.h"
2
3
4
5//**************************************************************************
6//  MACROS / CONSTANTS
7//**************************************************************************
8
9#define UPD7507C_TAG   "ic2"
10
11
12
13//**************************************************************************
14//  DEVICE DEFINITIONS
15//**************************************************************************
16
17const device_type APRICOT_KEYBOARD = &device_creator<apricot_keyboard_device>;
18
19
20//-------------------------------------------------
21//  device_config_complete - perform any
22//  operations now that the configuration is
23//  complete
24//-------------------------------------------------
25
26void apricot_keyboard_device::device_config_complete()
27{
28   // inherit a copy of the static data
29   const apricot_keyboard_interface *intf = reinterpret_cast<const apricot_keyboard_interface *>(static_config());
30   if (intf != NULL)
31      *static_cast<apricot_keyboard_interface *>(this) = *intf;
32
33   // or initialize to defaults if none provided
34   else
35   {
36      memset(&m_out_txd_cb, 0, sizeof(m_out_txd_cb));
37   }
38
39   m_shortname = "aprikb";
40}
41
42
43//-------------------------------------------------
44//  ROM( apricot_keyboard )
45//-------------------------------------------------
46
47ROM_START( apricot_keyboard )
48   ROM_REGION( 0x800, UPD7507C_TAG, 0 )
49   ROM_LOAD( "keyboard controller upd7507c.ic2", 0x000, 0x800, NO_DUMP )
50ROM_END
51
52
53//-------------------------------------------------
54//  rom_region - device-specific ROM region
55//-------------------------------------------------
56
57const rom_entry *apricot_keyboard_device::device_rom_region() const
58{
59   return ROM_NAME( apricot_keyboard );
60}
61
62
63//-------------------------------------------------
64//  ADDRESS_MAP( kb_io )
65//-------------------------------------------------
66/*
67static ADDRESS_MAP_START( apricot_keyboard_io, AS_IO, 8, apricot_keyboard_device )
68   AM_RANGE(0x00, 0x00) AM_READ(kb_lo_r)
69   AM_RANGE(0x01, 0x01) AM_READ(kb_hi_r)
70   AM_RANGE(0x03, 0x03) AM_WRITE(kb_p3_w)
71   AM_RANGE(0x04, 0x04) AM_WRITE(kb_y0_w)
72   AM_RANGE(0x05, 0x05) AM_WRITE(kb_y4_w)
73   AM_RANGE(0x06, 0x06) AM_READWRITE(kb_p6_r, kb_yc_w)
74   AM_RANGE(0x07, 0x07) AM_WRITE(kb_y8_w)
75ADDRESS_MAP_END
76*/
77
78
79//-------------------------------------------------
80//  MACHINE_DRIVER( apricot_keyboard )
81//-------------------------------------------------
82
83static MACHINE_CONFIG_FRAGMENT( apricot_keyboard )
84/*
85   MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz)
86   MCFG_CPU_IO_MAP(apricot_keyboard_io)
87*/
88MACHINE_CONFIG_END
89
90
91//-------------------------------------------------
92//  machine_config_additions - device-specific
93//  machine configurations
94//-------------------------------------------------
95
96machine_config_constructor apricot_keyboard_device::device_mconfig_additions() const
97{
98   return MACHINE_CONFIG_NAME( apricot_keyboard );
99}
100
101
102//-------------------------------------------------
103//  INPUT_PORTS( apricot_keyboard )
104//-------------------------------------------------
105
106INPUT_PORTS_START( apricot_keyboard )
107   PORT_START("Y0")
108   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
109   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
110   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
111   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
112   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
113   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
114   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
115   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
116   
117   PORT_START("Y1")
118   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
119   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
120   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
121   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
122   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
123   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
124   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
125   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
126   
127   PORT_START("Y2")
128   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
129   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
130   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
131   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
132   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
133   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
134   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
135   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
136   
137   PORT_START("Y3")
138   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
139   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
140   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
141   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
142   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
143   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
144   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
145   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
146   
147   PORT_START("Y4")
148   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
149   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
150   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
151   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
152   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
153   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
154   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
155   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
156   
157   PORT_START("Y5")
158   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
159   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
160   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
161   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
162   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
163   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
164   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
165   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
166   
167   PORT_START("Y6")
168   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
169   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
170   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
171   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
172   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
173   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
174   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
175   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
176   
177   PORT_START("Y7")
178   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
179   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
180   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
181   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
182   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
183   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
184   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
185   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
186   
187   PORT_START("Y8")
188   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
189   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
190   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
191   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
192   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
193   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
194   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
195   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
196   
197   PORT_START("Y9")
198   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
199   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
200   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
201   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
202   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
203   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
204   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
205   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
206   
207   PORT_START("YA")
208   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
209   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
210   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
211   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
212   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
213   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
214   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
215   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
216   
217   PORT_START("YB")
218   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
219   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
220   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
221   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
222   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
223   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
224   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
225   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
226   
227   PORT_START("YC")
228   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
229   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
230   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
231   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
232   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
233   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
234   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
235   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
236
237   PORT_START("MODIFIERS")
238   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_MAMEKEY(LCONTROL))
239   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
240INPUT_PORTS_END
241
242
243//-------------------------------------------------
244//  input_ports - device-specific input ports
245//-------------------------------------------------
246
247ioport_constructor apricot_keyboard_device::device_input_ports() const
248{
249   return INPUT_PORTS_NAME( apricot_keyboard );
250}
251
252
253
254//**************************************************************************
255//  LIVE DEVICE
256//**************************************************************************
257
258//-------------------------------------------------
259//  apricot_keyboard_device - constructor
260//-------------------------------------------------
261
262apricot_keyboard_device::apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
263    : device_t(mconfig, APRICOT_KEYBOARD, "Apricot Keyboard", tag, owner, clock)
264{
265}
266
267
268//-------------------------------------------------
269//  device_start - device-specific startup
270//-------------------------------------------------
271
272void apricot_keyboard_device::device_start()
273{
274   // resolve callbacks
275    m_out_txd_func.resolve(m_out_txd_cb, *this);
276}
277
278
279//-------------------------------------------------
280//  device_reset - device-specific reset
281//-------------------------------------------------
282
283void apricot_keyboard_device::device_reset()
284{
285}
286
287
288//-------------------------------------------------
289//  read_keyboard -
290//-------------------------------------------------
291
292UINT8 apricot_keyboard_device::read_keyboard()
293{
294   UINT8 data = 0xff;
295   
296   if (!BIT(m_kb_y, 0)) data &= input_port_read(machine(), "Y0");
297   if (!BIT(m_kb_y, 1)) data &= input_port_read(machine(), "Y1");
298   if (!BIT(m_kb_y, 2)) data &= input_port_read(machine(), "Y2");
299   if (!BIT(m_kb_y, 3)) data &= input_port_read(machine(), "Y3");
300   if (!BIT(m_kb_y, 4)) data &= input_port_read(machine(), "Y4");
301   if (!BIT(m_kb_y, 5)) data &= input_port_read(machine(), "Y5");
302   if (!BIT(m_kb_y, 6)) data &= input_port_read(machine(), "Y6");
303   if (!BIT(m_kb_y, 7)) data &= input_port_read(machine(), "Y7");
304   if (!BIT(m_kb_y, 8)) data &= input_port_read(machine(), "Y8");
305   if (!BIT(m_kb_y, 9)) data &= input_port_read(machine(), "Y9");
306   if (!BIT(m_kb_y, 10)) data &= input_port_read(machine(), "YA");
307   if (!BIT(m_kb_y, 11)) data &= input_port_read(machine(), "YB");
308   if (!BIT(m_kb_y, 12)) data &= input_port_read(machine(), "YC");
309   
310   return data;
311}
312
313
314//-------------------------------------------------
315//  kb_lo_r -
316//-------------------------------------------------
317
318READ8_MEMBER( apricot_keyboard_device::kb_lo_r )
319{
320   return read_keyboard() & 0x0f;
321}
322
323
324//-------------------------------------------------
325//  kb_hi_r -
326//-------------------------------------------------
327
328READ8_MEMBER( apricot_keyboard_device::kb_hi_r )
329{
330   return read_keyboard() >> 4;
331}
332
333
334//-------------------------------------------------
335//  kb_p6_r -
336//-------------------------------------------------
337
338READ8_MEMBER( apricot_keyboard_device::kb_p6_r )
339{
340   /*
341   
342      bit      description
343     
344      P60     
345      P61      SHIFT
346      P62      CONTROL
347   
348   */
349
350   UINT8 modifiers = input_port_read(machine(), "MODIFIERS");
351   
352   return modifiers << 1;
353}
354
355
356//-------------------------------------------------
357//  kb_p3_w -
358//-------------------------------------------------
359
360WRITE8_MEMBER( apricot_keyboard_device::kb_p3_w )
361{
362   // bit 1 controls the IR LEDs
363}
364
365
366//-------------------------------------------------
367//  kb_y0_w -
368//-------------------------------------------------
369
370WRITE8_MEMBER( apricot_keyboard_device::kb_y0_w )
371{
372   m_kb_y = (m_kb_y & 0xfff0) | (data & 0x0f);
373}
374
375
376//-------------------------------------------------
377//  kb_y4_w -
378//-------------------------------------------------
379
380WRITE8_MEMBER( apricot_keyboard_device::kb_y4_w )
381{
382   m_kb_y = (m_kb_y & 0xff0f) | ((data & 0x0f) << 4);
383}
384
385
386//-------------------------------------------------
387//  kb_y8_w -
388//-------------------------------------------------
389
390WRITE8_MEMBER( apricot_keyboard_device::kb_y8_w )
391{
392   m_kb_y = (m_kb_y & 0xf0ff) | ((data & 0x0f) << 8);
393}
394
395
396//-------------------------------------------------
397//  kb_yc_w -
398//-------------------------------------------------
399
400WRITE8_MEMBER( apricot_keyboard_device::kb_yc_w )
401{
402   m_kb_y = (m_kb_y & 0xf0ff) | ((data & 0x0f) << 12);
403}
src/mess/machine/apricotkb.h
r0r13625
1#pragma once
2
3#ifndef __APRICOT_KEYBOARD__
4#define __APRICOT_KEYBOARD__
5
6#define ADDRESS_MAP_MODERN
7
8#include "emu.h"
9
10
11
12//**************************************************************************
13//  MACROS / CONSTANTS
14//**************************************************************************
15
16#define APRICOT_KEYBOARD_TAG   "aprikb"
17
18
19
20//**************************************************************************
21//  INTERFACE CONFIGURATION MACROS
22//**************************************************************************
23
24#define MCFG_APRICOT_KEYBOARD_ADD(_config) \
25    MCFG_DEVICE_ADD(APRICOT_KEYBOARD_TAG, APRICOT_KEYBOARD, 0) \
26   MCFG_DEVICE_CONFIG(_config)
27
28
29#define APRICOT_KEYBOARD_INTERFACE(_name) \
30   const apricot_keyboard_interface (_name) =
31
32
33
34//**************************************************************************
35//  TYPE DEFINITIONS
36//**************************************************************************
37
38// ======================> apricot_keyboard_interface
39
40struct apricot_keyboard_interface
41{
42   devcb_write_line   m_out_txd_cb;
43};
44
45
46// ======================> apricot_keyboard_device
47
48class apricot_keyboard_device :  public device_t,
49                         public apricot_keyboard_interface
50{
51public:
52    // construction/destruction
53    apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
54
55   // optional information overrides
56   virtual const rom_entry *device_rom_region() const;
57   virtual machine_config_constructor device_mconfig_additions() const;
58   virtual ioport_constructor device_input_ports() const;
59
60   UINT8 read_keyboard();
61   READ8_MEMBER( kb_lo_r );
62   READ8_MEMBER( kb_hi_r );
63   READ8_MEMBER( kb_p6_r );
64   WRITE8_MEMBER( kb_p3_w );
65   WRITE8_MEMBER( kb_y0_w );
66   WRITE8_MEMBER( kb_y4_w );
67   WRITE8_MEMBER( kb_y8_w );
68   WRITE8_MEMBER( kb_yc_w );
69
70protected:
71    // device-level overrides
72    virtual void device_start();
73   virtual void device_reset();
74   virtual void device_config_complete();
75
76private:
77   devcb_resolved_write_line   m_out_txd_func;
78   
79   UINT16 m_kb_y;
80};
81
82
83// device type definition
84extern const device_type APRICOT_KEYBOARD;
85
86
87
88#endif
src/mess/includes/apricotp.h
r0r13625
1#pragma once
2
3#ifndef __APRICOTP__
4#define __APRICOTP__
5
6#define ADDRESS_MAP_MODERN
7
8#include "emu.h"
9#include "cpu/i86/i86.h"
10#include "cpu/m6800/m6800.h"
11#include "formats/basicdsk.h"
12#include "imagedev/flopdrv.h"
13#include "machine/8237dma.h"
14#include "machine/apricotkb.h"
15#include "machine/ctronics.h"
16#include "machine/pic8259.h"
17#include "machine/wd17xx.h"
18#include "machine/z80dart.h"
19#include "video/mc6845.h"
20#include "rendlay.h"
21
22
23
24//**************************************************************************
25//  MACROS / CONSTANTS
26//**************************************************************************
27
28#define SCREEN_TAG      "screen"
29#define I8086_TAG      "ic7"
30#define I8284_TAG      "ic30"
31#define I8237_TAG      "ic17"
32#define I8259A_TAG      "ic51"
33#define TMS4500_TAG      "ic42"
34#define MC6845_TAG      "ic69"
35#define HD63B01V1_TAG   "ic29"
36#define AD7574_TAG      "ic34"
37#define AD1408_TAG      "ic37"
38#define Z80SIO0_TAG      "ic6"
39#define WD2797_TAG      "ic5"
40#define UPD7507C_TAG   "ic2"
41#define CENTRONICS_TAG   "centronics"
42
43
44
45//**************************************************************************
46//  TYPE DEFINITIONS
47//**************************************************************************
48
49// ======================> fp_state
50
51class fp_state : public driver_device
52{
53public:
54   fp_state(const machine_config &mconfig, device_type type, const char *tag)
55      : driver_device(mconfig, type, tag),
56        m_maincpu(*this, I8086_TAG),
57        m_soundcpu(*this, HD63B01V1_TAG),
58        m_dmac(*this, I8237_TAG),
59        m_pic(*this, I8259A_TAG),
60        m_sio(*this, Z80SIO0_TAG),
61        m_fdc(*this, WD2797_TAG),
62        m_crtc(*this, MC6845_TAG),
63        m_floppy0(*this, FLOPPY_0),
64        m_centronics(*this, CENTRONICS_TAG)
65   { }
66
67   required_device<cpu_device> m_maincpu;
68   required_device<cpu_device> m_soundcpu;
69   required_device<i8237_device> m_dmac;
70   required_device<device_t> m_pic;
71   required_device<z80dart_device> m_sio;
72   required_device<device_t> m_fdc;
73   required_device<mc6845_device> m_crtc;
74   required_device<device_t> m_floppy0;
75   required_device<device_t> m_centronics;
76
77   virtual void machine_start();
78
79   virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
80};
81
82
83
84#endif
src/mess/includes/apricotf.h
r13624r13625
1010#include "cpu/z80/z80daisy.h"
1111#include "formats/basicdsk.h"
1212#include "imagedev/flopdrv.h"
13#include "machine/apricotkb.h"
1314#include "machine/ctronics.h"
1415#include "machine/wd17xx.h"
1516#include "machine/z80ctc.h"
r13624r13625
2425
2526#define SCREEN_TAG      "screen"
2627#define I8086_TAG      "10d"
27#define MC6845_TAG      "b12"
2828#define Z80CTC_TAG      "13d"
2929#define Z80SIO2_TAG      "15d"
3030#define WD2797_TAG      "5f"
31#define UPD7507C_TAG   "ic2"
3231#define CENTRONICS_TAG   "centronics"
3332
3433
r13624r13625
7170   DECLARE_WRITE_LINE_MEMBER( ctc_z1_w );
7271   DECLARE_WRITE_LINE_MEMBER( ctc_z2_w );
7372   
74   UINT8 read_keyboard();
75   READ8_MEMBER( kb_lo_r );
76   READ8_MEMBER( kb_hi_r );
77   READ8_MEMBER( kb_p6_r );
78   WRITE8_MEMBER( kb_p3_w );
79   WRITE8_MEMBER( kb_y0_w );
80   WRITE8_MEMBER( kb_y4_w );
81   WRITE8_MEMBER( kb_y8_w );
82   WRITE8_MEMBER( kb_yc_w );
83
8473   int m_ctc_int;
8574   int m_sio_int;
8675   
r13624r13625
8877   UINT16 *m_p_scrollram;
8978   int m_40_80;
9079   int m_200_256;
91   
92   UINT16 m_kb_y;
9380};
9481
95class f1p_state : public f1_state
96{
97public:
98   f1p_state(const machine_config &mconfig, device_type type, const char *tag)
99      : f1_state(mconfig, type, tag)
100   { }
10182
102   virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
103};
10483
10584#endif
src/mess/mess_dev.lst
r13624r13625
132132C64_XL80
133133KC_D004
134134WDXT_GEN
135APRICOT_KEYBOARD
src/mess/mess.mak
r13624r13625
567567$(MESSOBJ)/act.a:            \
568568   $(MESS_DRIVERS)/apricot.o   \
569569   $(MESS_DRIVERS)/apricotf.o   \
570   $(MESS_DRIVERS)/apricotp.o   \
571   $(MESS_MACHINE)/apricotkb.o   \
570572   $(MESS_DRIVERS)/victor9k.o   \
571573
572574$(MESSOBJ)/amiga.a:            \
src/mess/drivers/apricotp.c
r0r13625
1/***************************************************************************
2
3    ACT Apricot F1 series
4
5    preliminary driver by Angelo Salese
6
7
811/09/2011 - modernised. The portable doesn't seem to have
9             scroll registers, and it sets the palette to black.
10             I've added a temporary video output so that you can get
11             an idea of what the screen should look like. [Robbbert]
12
13****************************************************************************/
14
15/*
16
17   TODO:
18   
19   - CTC/SIO interrupt acknowledge
20   - CTC clocks
21   - sound
22   - portable has wrong devices
23
24*/
25
26#include "includes/apricotp.h"
27
28
29
30//**************************************************************************
31//  VIDEO
32//**************************************************************************
33
34bool fp_state::screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect)
35{
36   m_crtc->update(&bitmap, &cliprect);
37
38   return false;
39}
40
41
42static const gfx_layout charset_8x8 =
43{
44   8,8,
45   256,
46   1,
47   { 0 },
48   { 0, 1, 2, 3, 4, 5, 6, 7 },
49   { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
50   8*8
51};
52
53
54static GFXDECODE_START( act_f1 )
55   GFXDECODE_ENTRY( I8086_TAG, 0x0800, charset_8x8, 0, 1 )
56GFXDECODE_END
57
58
59
60//**************************************************************************
61//  ADDRESS MAPS
62//**************************************************************************
63
64//-------------------------------------------------
65//  ADDRESS_MAP( fp_mem )
66//-------------------------------------------------
67
68static ADDRESS_MAP_START( fp_mem, AS_PROGRAM, 16, fp_state )
69   ADDRESS_MAP_UNMAP_HIGH
70   AM_RANGE(0x00000, 0xeffff) AM_RAM// AM_BASE(m_p_videoram)
71   AM_RANGE(0xf0000, 0xf7fff) AM_RAM
72   AM_RANGE(0xf8000, 0xfffff) AM_ROM AM_REGION(I8086_TAG, 0)
73ADDRESS_MAP_END
74
75
76//-------------------------------------------------
77//  ADDRESS_MAP( fp_io )
78//-------------------------------------------------
79
80static ADDRESS_MAP_START( fp_io, AS_IO, 16, fp_state )
81ADDRESS_MAP_END
82
83
84//-------------------------------------------------
85//  ADDRESS_MAP( sound_mem )
86//-------------------------------------------------
87
88static ADDRESS_MAP_START( sound_mem, AS_PROGRAM, 8, fp_state )
89   AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION(HD63B01V1_TAG, 0)
90ADDRESS_MAP_END
91
92
93//-------------------------------------------------
94//  ADDRESS_MAP( sound_io )
95//-------------------------------------------------
96
97static ADDRESS_MAP_START( sound_io, AS_IO, 8, fp_state )
98   AM_RANGE(M6801_PORT1, M6801_PORT1)
99   AM_RANGE(M6801_PORT2, M6801_PORT2)
100   AM_RANGE(M6801_PORT3, M6801_PORT3)
101   AM_RANGE(M6801_PORT4, M6801_PORT4)
102ADDRESS_MAP_END
103
104
105
106//**************************************************************************
107//  INPUT PORTS
108//**************************************************************************
109
110//-------------------------------------------------
111//  INPUT_PORTS( act )
112//-------------------------------------------------
113
114static INPUT_PORTS_START( fp )
115   // defined in machine/apricotkb.c
116INPUT_PORTS_END
117
118
119
120//**************************************************************************
121//  DEVICE CONFIGURATION
122//**************************************************************************
123
124//-------------------------------------------------
125//  APRICOT_KEYBOARD_INTERFACE( kb_intf )
126//-------------------------------------------------
127
128static APRICOT_KEYBOARD_INTERFACE( kb_intf )
129{
130   DEVCB_NULL
131};
132
133
134//-------------------------------------------------
135//  pic8259_interface pic_intf
136//-------------------------------------------------
137
138static IRQ_CALLBACK( fp_irq_callback )
139{
140   fp_state *state = device->machine().driver_data<fp_state>();
141
142   return pic8259_acknowledge(state->m_pic);
143}
144
145/*
146
147   INT0   TIMER
148   INT1   FDC
149   INT2   6301
150   INT3   COMS
151   INT4   USART
152   INT5   COMS
153   INT6   PRINT
154   INT7   EOP
155
156*/
157
158static const struct pic8259_interface pic_intf =
159{
160   DEVCB_CPU_INPUT_LINE(I8086_TAG, INPUT_LINE_IRQ0),
161   DEVCB_LINE_VCC,
162   DEVCB_NULL
163};
164
165
166//-------------------------------------------------
167//  I8237_INTERFACE( dmac_intf )
168//-------------------------------------------------
169
170static I8237_INTERFACE( dmac_intf )
171{
172   DEVCB_NULL,
173   DEVCB_NULL,
174   DEVCB_NULL,
175   DEVCB_NULL,
176   { DEVCB_NULL, DEVCB_DEVICE_HANDLER(WD2797_TAG, wd17xx_data_r), DEVCB_NULL, DEVCB_NULL },
177   { DEVCB_NULL, DEVCB_DEVICE_HANDLER(WD2797_TAG, wd17xx_data_w), DEVCB_NULL, DEVCB_NULL },
178   { DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL }
179};
180
181
182//-------------------------------------------------
183//  Z80DART_INTERFACE( sio_intf )
184//-------------------------------------------------
185
186static Z80DART_INTERFACE( sio_intf )
187{
188   0, 0, 0, 0,
189
190   DEVCB_NULL,
191   DEVCB_NULL,
192   DEVCB_NULL,
193   DEVCB_NULL,
194   DEVCB_NULL,
195   DEVCB_NULL,
196
197   DEVCB_NULL,
198   DEVCB_NULL,
199   DEVCB_NULL,
200   DEVCB_NULL,
201   DEVCB_NULL,
202   DEVCB_NULL,
203
204   DEVCB_DEVICE_LINE(I8259A_TAG, pic8259_ir4_w)
205};
206
207
208//-------------------------------------------------
209//  wd17xx_interface fdc_intf
210//-------------------------------------------------
211
212static LEGACY_FLOPPY_OPTIONS_START( act )
213   LEGACY_FLOPPY_OPTION( img2hd, "dsk", "2HD disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
214      HEADS([2])
215      TRACKS([80])
216      SECTORS([16])
217      SECTOR_LENGTH([256])
218      FIRST_SECTOR_ID([1]))
219LEGACY_FLOPPY_OPTIONS_END
220
221static const floppy_interface act_floppy_interface =
222{
223   DEVCB_NULL,
224   DEVCB_NULL,
225   DEVCB_NULL,
226   DEVCB_NULL,
227   DEVCB_NULL,
228   FLOPPY_STANDARD_3_5_DSDD, // Sony OA-D32W
229   LEGACY_FLOPPY_OPTIONS_NAME(act),
230   "floppy_3_5",
231   NULL
232};
233
234static const wd17xx_interface fdc_intf =
235{
236   DEVCB_LINE_GND,
237   DEVCB_DEVICE_LINE(I8259A_TAG, pic8259_ir1_w),
238   DEVCB_DEVICE_LINE(I8237_TAG, i8237_dreq1_w),
239   { FLOPPY_0, NULL, NULL, NULL }
240};
241
242
243//-------------------------------------------------
244//  centronics_interface centronics_intf
245//-------------------------------------------------
246
247static const centronics_interface centronics_intf =
248{
249   0,
250   DEVCB_NULL,
251   DEVCB_NULL,
252   DEVCB_NULL
253};
254
255
256//-------------------------------------------------
257//  mc6845_interface crtc_intf
258//-------------------------------------------------
259
260static MC6845_UPDATE_ROW( fp_update_row )
261{
262}
263
264static const mc6845_interface crtc_intf =
265{
266   SCREEN_TAG,
267   8,
268   NULL,
269   fp_update_row,
270   NULL,
271   DEVCB_NULL,
272   DEVCB_NULL,
273   DEVCB_NULL,
274   DEVCB_NULL,
275   NULL
276};
277
278
279
280//**************************************************************************
281//  MACHINE INITIALIZATION
282//**************************************************************************
283
284//-------------------------------------------------
285//  MACHINE_START( pc1512 )
286//-------------------------------------------------
287
288void fp_state::machine_start()
289{
290   // register CPU IRQ callback
291   device_set_irq_callback(m_maincpu, fp_irq_callback);
292}
293
294
295
296//**************************************************************************
297//  MACHINE DRIVERS
298//**************************************************************************
299
300//-------------------------------------------------
301//  MACHINE_CONFIG( fp )
302//-------------------------------------------------
303
304static MACHINE_CONFIG_START( fp, fp_state )
305   /* basic machine hardware */
306   MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_15MHz/3)
307   MCFG_CPU_PROGRAM_MAP(fp_mem)
308   MCFG_CPU_IO_MAP(fp_io)
309
310   MCFG_CPU_ADD(HD63B01V1_TAG, HD6301, 2000000)
311   MCFG_CPU_PROGRAM_MAP(sound_mem)
312   MCFG_CPU_IO_MAP(sound_io)
313   MCFG_DEVICE_DISABLE()
314
315   /* video hardware */
316   MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
317   MCFG_SCREEN_REFRESH_RATE(50)
318   MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
319   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
320   MCFG_SCREEN_SIZE(640, 256)
321   MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
322   MCFG_PALETTE_LENGTH(2)
323   MCFG_PALETTE_INIT(black_and_white)
324   MCFG_GFXDECODE(act_f1)
325   MCFG_DEFAULT_LAYOUT( layout_lcd )
326   
327   MCFG_MC6845_ADD(MC6845_TAG, MC6845, 4000000, crtc_intf)
328
329   /* Devices */
330   MCFG_APRICOT_KEYBOARD_ADD(kb_intf)
331   MCFG_I8237_ADD(I8237_TAG, 250000, dmac_intf)
332   MCFG_PIC8259_ADD(I8259A_TAG, pic_intf)
333   MCFG_Z80DART_ADD(Z80SIO0_TAG, 2500000, sio_intf)
334   MCFG_WD2797_ADD(WD2797_TAG, fdc_intf)
335   MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(act_floppy_interface)
336   MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_intf)
337MACHINE_CONFIG_END
338
339
340
341//**************************************************************************
342//  ROMS
343//**************************************************************************
344
345//-------------------------------------------------
346//  ROM( fp )
347//-------------------------------------------------
348
349ROM_START( fp )
350   ROM_REGION( 0x8000, I8086_TAG, 0 )
351   ROM_LOAD16_BYTE( "lo_fp_3.1.ic20", 0x0000, 0x4000, CRC(0572add2) SHA1(c7ab0e5ced477802e37f9232b5673f276b8f5623) )   // Labelled 11212721 F97E PORT LO VR 3.1
352   ROM_LOAD16_BYTE( "hi_fp_3.1.ic9",  0x0001, 0x4000, CRC(3903674b) SHA1(8418682dcc0c52416d7d851760fea44a3cf2f914) )   // Labelled 11212721 BD2D PORT HI VR 3.1
353
354   ROM_REGION( 0x1000, HD63B01V1_TAG, 0 )
355   ROM_LOAD( "voice interface hd63b01v01.ic29", 0x0000, 0x1000, NO_DUMP )
356ROM_END
357
358
359
360//**************************************************************************
361//  SYSTEM DRIVERS
362//**************************************************************************
363
364//    YEAR  NAME        PARENT      COMPAT  MACHINE     INPUT   INIT     COMPANY             FULLNAME        FLAGS
365COMP( 1984, fp,    0,      0,      fp,   fp,    0,     "ACT",   "Apricot Portable / FP", GAME_NOT_WORKING | GAME_NO_SOUND )
src/mess/drivers/apricotf.c
r13624r13625
164164//  KEYBOARD
165165//**************************************************************************
166166
167UINT8 f1_state::read_keyboard()
168{
169   UINT8 data = 0xff;
170   
171   if (!BIT(m_kb_y, 0)) data &= input_port_read(machine(), "Y0");
172   if (!BIT(m_kb_y, 1)) data &= input_port_read(machine(), "Y1");
173   if (!BIT(m_kb_y, 2)) data &= input_port_read(machine(), "Y2");
174   if (!BIT(m_kb_y, 3)) data &= input_port_read(machine(), "Y3");
175   if (!BIT(m_kb_y, 4)) data &= input_port_read(machine(), "Y4");
176   if (!BIT(m_kb_y, 5)) data &= input_port_read(machine(), "Y5");
177   if (!BIT(m_kb_y, 6)) data &= input_port_read(machine(), "Y6");
178   if (!BIT(m_kb_y, 7)) data &= input_port_read(machine(), "Y7");
179   if (!BIT(m_kb_y, 8)) data &= input_port_read(machine(), "Y8");
180   if (!BIT(m_kb_y, 9)) data &= input_port_read(machine(), "Y9");
181   if (!BIT(m_kb_y, 10)) data &= input_port_read(machine(), "YA");
182   if (!BIT(m_kb_y, 11)) data &= input_port_read(machine(), "YB");
183   if (!BIT(m_kb_y, 12)) data &= input_port_read(machine(), "YC");
184   
185   return data;
186}
187167
188
189READ8_MEMBER( f1_state::kb_lo_r )
190{
191   return read_keyboard() & 0x0f;
192}
193
194
195READ8_MEMBER( f1_state::kb_hi_r )
196{
197   return read_keyboard() >> 4;
198}
199
200
201READ8_MEMBER( f1_state::kb_p6_r )
202{
203   /*
204   
205      bit      description
206     
207      P60     
208      P61      SHIFT
209      P62      CONTROL
210   
211   */
212
213   UINT8 modifiers = input_port_read(machine(), "MODIFIERS");
214   
215   return modifiers << 1;
216}
217
218
219WRITE8_MEMBER( f1_state::kb_p3_w )
220{
221   // bit 1 controls the IR LEDs
222}
223
224
225WRITE8_MEMBER( f1_state::kb_y0_w )
226{
227   m_kb_y = (m_kb_y & 0xfff0) | (data & 0x0f);
228}
229
230
231WRITE8_MEMBER( f1_state::kb_y4_w )
232{
233   m_kb_y = (m_kb_y & 0xff0f) | ((data & 0x0f) << 4);
234}
235
236
237WRITE8_MEMBER( f1_state::kb_y8_w )
238{
239   m_kb_y = (m_kb_y & 0xf0ff) | ((data & 0x0f) << 8);
240}
241
242
243WRITE8_MEMBER( f1_state::kb_yc_w )
244{
245   m_kb_y = (m_kb_y & 0xf0ff) | ((data & 0x0f) << 12);
246}
247
248
249
250168//**************************************************************************
251169//  ADDRESS MAPS
252170//**************************************************************************
r13624r13625
266184
267185
268186//-------------------------------------------------
269//  ADDRESS_MAP( act_f1p_mem )
270//-------------------------------------------------
271
272static ADDRESS_MAP_START( act_f1p_mem, AS_PROGRAM, 16, f1p_state )
273   ADDRESS_MAP_UNMAP_HIGH
274   AM_RANGE(0x00000, 0xeffff) AM_RAM// AM_BASE(m_p_videoram)
275   AM_RANGE(0xf0000, 0xf7fff) AM_RAM
276   AM_RANGE(0xf8000, 0xfffff) AM_ROM AM_REGION(I8086_TAG, 0)
277ADDRESS_MAP_END
278
279
280//-------------------------------------------------
281187//  ADDRESS_MAP( act_f1_io )
282188//-------------------------------------------------
283189
r13624r13625
292198ADDRESS_MAP_END
293199
294200
295//-------------------------------------------------
296//  ADDRESS_MAP( kb_io )
297//-------------------------------------------------
298/*
299static ADDRESS_MAP_START( kb_io, AS_IO, 8, f1_state )
300   AM_RANGE(0x00, 0x00) AM_READ(kb_lo_r)
301   AM_RANGE(0x01, 0x01) AM_READ(kb_hi_r)
302   AM_RANGE(0x03, 0x03) AM_WRITE(kb_p3_w)
303   AM_RANGE(0x04, 0x04) AM_WRITE(kb_y0_w)
304   AM_RANGE(0x05, 0x05) AM_WRITE(kb_y4_w)
305   AM_RANGE(0x06, 0x06) AM_READWRITE(kb_p6_r, kb_yc_w)
306   AM_RANGE(0x07, 0x07) AM_WRITE(kb_y8_w)
307ADDRESS_MAP_END
308*/
309
310
311201//**************************************************************************
312202//  INPUT PORTS
313203//**************************************************************************
r13624r13625
317207//-------------------------------------------------
318208
319209static INPUT_PORTS_START( act )
320   PORT_START("Y0")
321   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
322   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
323   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
324   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
325   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
326   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
327   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
328   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
329   
330   PORT_START("Y1")
331   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
332   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
333   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
334   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
335   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
336   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
337   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
338   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
339   
340   PORT_START("Y2")
341   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
342   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
343   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
344   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
345   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
346   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
347   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
348   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
349   
350   PORT_START("Y3")
351   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
352   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
353   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
354   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
355   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
356   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
357   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
358   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
359   
360   PORT_START("Y4")
361   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
362   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
363   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
364   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
365   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
366   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
367   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
368   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
369   
370   PORT_START("Y5")
371   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
372   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
373   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
374   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
375   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
376   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
377   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
378   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
379   
380   PORT_START("Y6")
381   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
382   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
383   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
384   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
385   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
386   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
387   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
388   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
389   
390   PORT_START("Y7")
391   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
392   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
393   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
394   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
395   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
396   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
397   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
398   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
399   
400   PORT_START("Y8")
401   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
402   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
403   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
404   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
405   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
406   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
407   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
408   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
409   
410   PORT_START("Y9")
411   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
412   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
413   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
414   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
415   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
416   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
417   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
418   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
419   
420   PORT_START("YA")
421   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
422   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
423   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
424   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
425   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
426   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
427   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
428   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
429   
430   PORT_START("YB")
431   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
432   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
433   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
434   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
435   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
436   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
437   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
438   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
439   
440   PORT_START("YC")
441   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD )
442   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD )
443   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )
444   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )
445   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )
446   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )
447   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD )
448   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )
449
450   PORT_START("MODIFIERS")
451   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_MAMEKEY(LCONTROL))
452   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
210   // defined in machine/apricotkb.c
453211INPUT_PORTS_END
454212
455213
r13624r13625
459217//**************************************************************************
460218
461219//-------------------------------------------------
220//  APRICOT_KEYBOARD_INTERFACE( kb_intf )
221//-------------------------------------------------
222
223static APRICOT_KEYBOARD_INTERFACE( kb_intf )
224{
225   DEVCB_NULL
226};
227
228
229//-------------------------------------------------
462230//  Z80DART_INTERFACE( sio_intf )
463231//-------------------------------------------------
464232
r13624r13625
597365   MCFG_GFXDECODE(act_f1)
598366
599367   /* Devices */
368   MCFG_APRICOT_KEYBOARD_ADD(kb_intf)
600369   MCFG_Z80DART_ADD(Z80SIO2_TAG, 2500000, sio_intf)
601370   MCFG_Z80CTC_ADD(Z80CTC_TAG, 2500000, ctc_intf)
602371   MCFG_WD2797_ADD(WD2797_TAG, fdc_intf)
r13624r13625
605374MACHINE_CONFIG_END
606375
607376
608//-------------------------------------------------
609//  MACHINE_CONFIG( act_f1p )
610//-------------------------------------------------
611377
612static MACHINE_CONFIG_START( act_f1p, f1p_state )
613   /* basic machine hardware */
614   MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_15MHz/3)
615   MCFG_CPU_PROGRAM_MAP(act_f1p_mem)
616   MCFG_CPU_IO_MAP(act_f1_io)
617/*
618   MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz)
619   MCFG_CPU_IO_MAP(kb_io)
620*/
621   /* video hardware */
622   MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
623   MCFG_SCREEN_REFRESH_RATE(50)
624   MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
625   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
626   MCFG_SCREEN_SIZE(640, 256)
627   MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
628   MCFG_PALETTE_LENGTH(2)
629   MCFG_PALETTE_INIT(black_and_white)
630   MCFG_GFXDECODE(act_f1)
631   MCFG_DEFAULT_LAYOUT( layout_lcd )
632
633   /* Devices */
634   MCFG_Z80DART_ADD(Z80SIO2_TAG, 2500000, sio_intf)
635   MCFG_Z80CTC_ADD(Z80CTC_TAG, 2500000, ctc_intf)
636   MCFG_WD2797_ADD(WD2797_TAG, fdc_intf)
637   MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(act_floppy_interface)
638   MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_intf)
639MACHINE_CONFIG_END
640
641
642
643378//**************************************************************************
644379//  ROMS
645380//**************************************************************************
r13624r13625
652387   ROM_REGION( 0x8000, I8086_TAG, 0 )
653388   ROM_LOAD16_BYTE( "lo_f1_1.6.8f",  0x0000, 0x4000, CRC(be018be2) SHA1(80b97f5b2111daf112c69b3f58d1541a4ba69da0) )   // Labelled F1 - LO Vr. 1.6
654389   ROM_LOAD16_BYTE( "hi_f1_1.6.10f", 0x0001, 0x4000, CRC(bbba77e2) SHA1(e62bed409eb3198f4848f85fccd171cd0745c7c0) )   // Labelled F1 - HI Vr. 1.6
655
656   ROM_REGION( 0x800, UPD7507C_TAG, 0 )
657   ROM_LOAD( "keyboard controller upd7507c.ic2", 0x000, 0x800, NO_DUMP )
658390ROM_END
659391
660392#define rom_f1e rom_f1
r13624r13625
669401   ROM_REGION( 0x8000, I8086_TAG, 0 )
670402   ROM_LOAD16_BYTE( "lo_f10_3.1.1.8f",  0x0000, 0x4000, CRC(bfd46ada) SHA1(0a36ef379fa9af7af9744b40c167ce6e12093485) )   // Labelled LO-FRange Vr3.1.1
671403   ROM_LOAD16_BYTE( "hi_f10_3.1.1.10f", 0x0001, 0x4000, CRC(67ad5b3a) SHA1(a5ececb87476a30167cf2a4eb35c03aeb6766601) )   // Labelled HI-FRange Vr3.1.1
672
673   ROM_REGION( 0x800, UPD7507C_TAG, 0 )
674   ROM_LOAD( "keyboard controller upd7507c.ic2", 0x000, 0x800, NO_DUMP )
675404ROM_END
676405
677406
678//-------------------------------------------------
679//  ROM( fp )
680//-------------------------------------------------
681407
682ROM_START( fp )
683   ROM_REGION( 0x8000, I8086_TAG, 0 )
684   ROM_LOAD16_BYTE( "lo_fp_3.1.ic20", 0x0000, 0x4000, CRC(0572add2) SHA1(c7ab0e5ced477802e37f9232b5673f276b8f5623) )   // Labelled 11212721 F97E PORT LO VR 3.1
685   ROM_LOAD16_BYTE( "hi_fp_3.1.ic9",  0x0001, 0x4000, CRC(3903674b) SHA1(8418682dcc0c52416d7d851760fea44a3cf2f914) )   // Labelled 11212721 BD2D PORT HI VR 3.1
686
687   ROM_REGION( 0x1000, "hd63b01v1", 0 )
688   ROM_LOAD( "voice interface hd63b01v01.ic29", 0x0000, 0x1000, NO_DUMP )
689
690   ROM_REGION( 0x800, UPD7507C_TAG, 0 )
691   ROM_LOAD( "keyboard controller upd7507c.ic2", 0x000, 0x800, NO_DUMP )
692ROM_END
693
694
695
696408//**************************************************************************
697409//  SYSTEM DRIVERS
698410//**************************************************************************
r13624r13625
702414COMP( 1984, f1e,   f1,     0,      act_f1,    act,    0,     "ACT",   "Apricot F1e",           GAME_NOT_WORKING | GAME_NO_SOUND )
703415COMP( 1984, f2,    f1,     0,      act_f1,    act,    0,     "ACT",   "Apricot F2",            GAME_NOT_WORKING | GAME_NO_SOUND )
704416COMP( 1985, f10,   f1,     0,      act_f1,    act,    0,     "ACT",   "Apricot F10",           GAME_NOT_WORKING | GAME_NO_SOUND )
705COMP( 1984, fp,    0,      0,      act_f1p,   act,    0,     "ACT",   "Apricot Portable / FP", GAME_NOT_WORKING | GAME_NO_SOUND )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team