Previous 15994 Revisions Next

r9601 Wednesday 17th November, 2010 at 12:57:05 UTC by Curt Coder
[AMU880] Refactored driver to define ADDRESS_MAP_MODERN, and fixed keyboard.
[docs]messnew.txt
[src/mess/drivers]huebler.c
[src/mess/includes]huebler.h

src/mess/includes/huebler.h
r9600r9601
1313{
1414public:
1515   amu880_state(running_machine &machine, const driver_device_config_base &config)
16      : driver_device(machine, config) { }
16      : driver_device(machine, config),
17        m_cassette(*this, CASSETTE_TAG),
18        m_key_d6(0),
19        m_key_d7(0),
20        m_key_a8(1)
21   { }
1722
18   /* keyboard state */
19   int key_y;
20   int keylatch;
21   const UINT8 *keyboard_rom;
23   required_device<running_device> m_cassette;
2224
23   /* video state */
24   UINT8 *video_ram;
25   const UINT8 *char_rom;
25   virtual void machine_start();
2626
27   /* devices */
28   running_device *cassette;
27   virtual void video_start();
28   virtual bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
29
30   DECLARE_READ8_MEMBER( keyboard_r );
31
32   void scan_keyboard();
33
34   // keyboard state
35   const UINT8 *m_kb_rom;
36   int m_key_d6;
37   int m_key_d7;
38   int m_key_a4;
39   int m_key_a5;
40   int m_key_a8;
41
42   // video state
43   UINT8 *m_video_ram;
44   const UINT8 *m_char_rom;
2945};
3046
3147#endif
src/mess/drivers/huebler.c
r9600r9601
11/***************************************************************************
22
3    Ausbauf?higer Mikrocomputer mit dem U 880
3    Ausbaufaehiger Mikrocomputer mit dem U 880
44    electronica Band 227/228
55
66****************************************************************************/
r9600r9601
99
1010    TODO:
1111
12    - keyboard repeat is too fast
12    - keyboard repeat
13   - shift lock is not PORT_TOGGLE, instead RS flipflop
1314    - tone generator
14    - cassette (Z80SIO)
15    - cassette serial clock
1516    - eprom programmer
1617    - power off
1718
1819*/
1920
21#define ADDRESS_MAP_MODERN
22
2023#include "emu.h"
2124#include "includes/huebler.h"
2225#include "cpu/z80/z80.h"
2326#include "cpu/z80/z80daisy.h"
2427#include "devices/cassette.h"
2528#include "machine/z80pio.h"
26#include "machine/z80sio.h"
29#include "machine/z80dart.h"
2730#include "machine/z80ctc.h"
2831#include "devices/messram.h"
2932
3033/* Keyboard */
3134
32static TIMER_DEVICE_CALLBACK( keyboard_tick )
35void amu880_state::scan_keyboard()
3336{
34   amu880_state *state = timer.machine->driver_data<amu880_state>();
37   static const char *const keynames[] = { "Y0", "Y1", "Y2", "Y3", "Y4", "Y5", "Y6", "Y7", "Y8", "Y9", "Y10", "Y11", "Y12", "Y13", "Y14", "Y15" };
3538
36   state->key_y++;
39   UINT8 data = input_port_read(machine, keynames[m_key_a8 ? m_key_d6 : m_key_d7]);
3740
38   if (state->key_y == 16)
41   int a8 = (data & 0x0f) == 0x0f;
42
43   if (m_key_a8 && !a8)
3944   {
40      state->key_y = 0;
45      m_key_d7 = m_key_d6;
46      m_key_a4 = !(BIT(data, 1) & BIT(data, 3));
47      m_key_a5 = !(BIT(data, 2) & BIT(data, 3));
4148   }
49
50   m_key_a8 = a8;
51
52   m_key_d6++;
53
54   if (m_key_d6 == 16)
55   {
56      m_key_d6 = 0;
57   }
4258}
4359
60static TIMER_DEVICE_CALLBACK( keyboard_tick )
61{
62   amu880_state *state = timer.machine->driver_data<amu880_state>();
63
64   state->scan_keyboard();
65}
66
4467/* Read/Write Handlers */
4568
46static READ8_HANDLER( keyboard_r )
69READ8_MEMBER( amu880_state::keyboard_r )
4770{
4871   /*
4972
r9600r9601
5780
5881    */
5982
60   amu880_state *state = space->machine->driver_data<amu880_state>();
61
62   static const char *const keynames[] = { "Y0", "Y1", "Y2", "Y3", "Y4", "Y5", "Y6", "Y7", "Y8", "Y9", "Y10", "Y11", "Y12", "Y13", "Y14", "Y15" };
63
64   UINT8 data = input_port_read(space->machine, keynames[state->key_y]);
65   UINT8 special = input_port_read(space->machine, "SPECIAL");
66   UINT16 address;
67
83   UINT8 special = input_port_read(machine, "SPECIAL");
84   
6885   int ctrl = BIT(special, 0);
6986   int shift = BIT(special, 2) & BIT(special, 1);
70   int a8 = (data & 0x0f) == 0x0f;
7187   int ab0 = BIT(offset, 0);
88   
89   UINT16 address = (ab0 << 9) | (m_key_a8 << 8) | (ctrl << 7) | (shift << 6) | (m_key_a5 << 5) | (m_key_a4 << 4) | m_key_d7;
7290
73   if (!a8)
74   {
75      int a4 = BIT(data, 1) & BIT(data, 3);
76      int a5 = BIT(data, 2) & BIT(data, 3);
77
78      state->keylatch = (!a5 << 5) | (!a4 << 4) | state->key_y;
79   }
80
81   address = (ab0 << 9) | (a8 << 8) | (ctrl << 7) | (shift << 6) | state->keylatch;
82
83   return state->keyboard_rom[address];
91   return m_kb_rom[address];
8492}
8593
8694/* Memory Maps */
8795
88static ADDRESS_MAP_START( amu880_mem, ADDRESS_SPACE_PROGRAM, 8 )
96static ADDRESS_MAP_START( amu880_mem, ADDRESS_SPACE_PROGRAM, 8, amu880_state )
8997   ADDRESS_MAP_UNMAP_HIGH
9098   AM_RANGE(0x0000, 0xe7ff) AM_RAM
91   AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE_MEMBER(amu880_state, video_ram)
99   AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(m_video_ram)
92100   AM_RANGE(0xf000, 0xfbff) AM_ROM
93101   AM_RANGE(0xfc00, 0xffff) AM_RAM
94102ADDRESS_MAP_END
95103
96static ADDRESS_MAP_START( amu880_io, ADDRESS_SPACE_IO, 8 )
104static ADDRESS_MAP_START( amu880_io, ADDRESS_SPACE_IO, 8, amu880_state )
97105   ADDRESS_MAP_UNMAP_HIGH
98106   ADDRESS_MAP_GLOBAL_MASK(0xff)
99107//  AM_RANGE(0x00, 0x00) AM_MIRROR(0x03) AM_WRITE(power_off_w)
100108//  AM_RANGE(0x04, 0x04) AM_MIRROR(0x02) AM_WRITE(tone_off_w)
101109//  AM_RANGE(0x05, 0x05) AM_MIRROR(0x02) AM_WRITE(tone_on_w)
102110   AM_RANGE(0x08, 0x09) AM_MIRROR(0x02) AM_READ(keyboard_r)
103   AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(Z80PIO2_TAG, z80pio_ba_cd_r, z80pio_ba_cd_w)
104   AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(Z80PIO1_TAG, z80pio_ba_cd_r, z80pio_ba_cd_w)
105   AM_RANGE(0x14, 0x17) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_r, z80ctc_w)
106   AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE(Z80SIO_TAG, z80sio_ba_cd_r, z80sio_ba_cd_w)
111   AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE_LEGACY(Z80PIO2_TAG, z80pio_ba_cd_r, z80pio_ba_cd_w)
112   AM_RANGE(0x10, 0x13) AM_DEVREADWRITE_LEGACY(Z80PIO1_TAG, z80pio_ba_cd_r, z80pio_ba_cd_w)
113   AM_RANGE(0x14, 0x17) AM_DEVREADWRITE_LEGACY(Z80CTC_TAG, z80ctc_r, z80ctc_w)
114   AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE_LEGACY(Z80SIO_TAG, z80dart_ba_cd_r, z80dart_ba_cd_w)
107115ADDRESS_MAP_END
108116
109117/* Input Ports */
r9600r9601
213221
214222/* Video */
215223
216static VIDEO_START( amu880 )
224void amu880_state::video_start()
217225{
218   amu880_state *state = machine->driver_data<amu880_state>();
219
220   /* find memory regions */
221   state->char_rom = memory_region(machine, "chargen");
226   // find memory regions
227   m_char_rom = memory_region(machine, "chargen");
222228}
223229
224static VIDEO_UPDATE( amu880 )
230bool amu880_state::video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect)
225231{
226   amu880_state *state = screen->machine->driver_data<amu880_state>();
227
228232   int y, sx, x, line;
229233
230234   for (y = 0; y < 240; y++)
r9600r9601
234238      for (sx = 0; sx < 64; sx++)
235239      {
236240         UINT16 videoram_addr = ((y / 10) * 64) + sx;
237         UINT8 videoram_data = state->video_ram[videoram_addr & 0x7ff];
241         UINT8 videoram_data = m_video_ram[videoram_addr & 0x7ff];
238242
239243         UINT16 charrom_addr = ((videoram_data & 0x7f) << 3) | line;
240         UINT8 data = state->char_rom[charrom_addr & 0x3ff];
244         UINT8 data = m_char_rom[charrom_addr & 0x3ff];
241245
242246         for (x = 0; x < 6; x++)
243247         {
244248            int color = ((line > 7) ? 0 : BIT(data, 7)) ^ BIT(videoram_data, 7);
245249
246            *BITMAP_ADDR16(bitmap, y, (sx * 6) + x) = color;
250            *BITMAP_ADDR16(&bitmap, y, (sx * 6) + x) = color;
247251
248252            data <<= 1;
249253         }
r9600r9601
259263{
260264}
261265
262static WRITE_LINE_DEVICE_HANDLER( ctc_z1_w )
263{
264}
265
266266static WRITE_LINE_DEVICE_HANDLER( ctc_z2_w )
267267{
268268   /* cassette transmit/receive clock */
r9600r9601
273273   0,                 /* timer disables */
274274   DEVCB_CPU_INPUT_LINE(Z80_TAG, INPUT_LINE_IRQ0),   /* interrupt handler */
275275   DEVCB_LINE(ctc_z0_w),   /* ZC/TO0 callback */
276   DEVCB_LINE(ctc_z1_w),   /* ZC/TO1 callback */
276   DEVCB_DEVICE_LINE(Z80SIO_TAG, z80dart_rxtxcb_w),   /* ZC/TO1 callback */
277277   DEVCB_LINE(ctc_z2_w)   /* ZC/TO2 callback */
278278};
279279
r9600r9601
303303
304304/* Z80-SIO Interface */
305305
306static void z80daisy_interrupt(running_device *device, int state)
306static READ_LINE_DEVICE_HANDLER( cassette_r )
307307{
308   cputag_set_input_line(device->machine, Z80_TAG, INPUT_LINE_IRQ0, state);
308   return cassette_input(device) < 0.0;
309309}
310310
311static const z80sio_interface sio_intf =
311static WRITE_LINE_DEVICE_HANDLER( cassette_w )
312312{
313   z80daisy_interrupt,   /* interrupt handler */
314   NULL,            /* DTR changed handler */
315   NULL,            /* RTS changed handler */
316   NULL,            /* BREAK changed handler */
317   NULL,            /* transmit handler */
318   NULL            /* receive handler */
313   cassette_output(device, state ? -1.0 : +1.0);
314}
315
316static Z80DART_INTERFACE( sio_intf )
317{
318   0, 0, 0, 0,
319
320   DEVCB_DEVICE_LINE(CASSETTE_TAG, cassette_r),
321   DEVCB_DEVICE_LINE(CASSETTE_TAG, cassette_w),
322   DEVCB_NULL,
323   DEVCB_NULL,
324   DEVCB_NULL,
325   DEVCB_NULL,
326
327   DEVCB_NULL,
328   DEVCB_NULL,
329   DEVCB_NULL,
330   DEVCB_NULL,
331   DEVCB_NULL,
332   DEVCB_NULL,
333
334   DEVCB_CPU_INPUT_LINE(Z80_TAG, INPUT_LINE_IRQ0)
319335};
320336
321337/* Z80 Daisy Chain */
r9600r9601
331347
332348/* Machine Initialization */
333349
334static MACHINE_START( amu880 )
350void amu880_state::machine_start()
335351{
336   amu880_state *state = machine->driver_data<amu880_state>();
337
338   /* find devices */
339   state->cassette = machine->device(CASSETTE_TAG);
340
341352   /* find memory regions */
342   state->keyboard_rom = memory_region(machine, "keyboard");
353   m_kb_rom = memory_region(machine, "keyboard");
343354
344355   /* register for state saving */
345   state_save_register_global(machine, state->key_y);
346   state_save_register_global(machine, state->keylatch);
356   state_save_register_global(machine, m_key_d6);
357   state_save_register_global(machine, m_key_d7);
358   state_save_register_global(machine, m_key_a4);
359   state_save_register_global(machine, m_key_a5);
360   state_save_register_global(machine, m_key_a8);
347361}
348362
349363/* Machine Driver */
r9600r9601
376390
377391
378392static MACHINE_CONFIG_START( amu880, amu880_state )
379
380393   /* basic machine hardware */
381   MDRV_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz/4) /* U880D */
394   MDRV_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz/4) // U880D
382395   MDRV_CPU_PROGRAM_MAP(amu880_mem)
383396   MDRV_CPU_IO_MAP(amu880_io)
384397   MDRV_CPU_CONFIG(amu880_daisy_chain)
385398
386   MDRV_MACHINE_START(amu880)
387
388399   MDRV_TIMER_ADD_PERIODIC("keyboard", keyboard_tick, HZ(1500))
389400
390401   /* video hardware */
r9600r9601
396407   MDRV_PALETTE_LENGTH(2)
397408   MDRV_PALETTE_INIT(black_and_white)
398409
399   MDRV_VIDEO_START(amu880)
400   MDRV_VIDEO_UPDATE(amu880)
401
402410   /* devices */
403411   MDRV_Z80CTC_ADD(Z80CTC_TAG, XTAL_10MHz/4, ctc_intf)
404412   MDRV_Z80PIO_ADD(Z80PIO1_TAG, XTAL_10MHz/4, pio1_intf)
405413   MDRV_Z80PIO_ADD(Z80PIO2_TAG, XTAL_10MHz/4, pio2_intf)
406   MDRV_Z80SIO_ADD(Z80SIO_TAG, XTAL_10MHz/4, sio_intf)
414   MDRV_Z80SIO0_ADD(Z80SIO_TAG, XTAL_10MHz/4, sio_intf) // U856
407415
408416   MDRV_CASSETTE_ADD(CASSETTE_TAG, amu880_cassette_config)
409417
r9600r9601
438446/* System Drivers */
439447
440448/*    YEAR  NAME    PARENT  COMPAT  MACHINE INPUT   INIT    COMPANY                     FULLNAME                                        FLAGS */
441COMP( 1983, amu880,   0,      0,      amu880,   amu880,   0,      "Militaerverlag der DDR",   "Ausbaufaehiger Mikrocomputer mit dem U 880",   GAME_NOT_WORKING | GAME_NO_SOUND )
449COMP( 1983, amu880,   0,      0,      amu880,   amu880,   0,      "Militaerverlag der DDR",   "Ausbaufaehiger Mikrocomputer mit dem U 880",   GAME_NO_SOUND )
docs/messnew.txt
r9600r9601
99
1010Systems Promoted from GAME_NOT_WORKING:
1111---------------------------------------
12(none)
12- Ausbaufaehiger Mikrocomputer mit dem U 880 [Curt Coder]
1313
1414
1515
r9600r9601
3232
3333- [ABC800C] Added Color version ROMs. [Ola Andersson]
3434
35- [AMU880] Refactored driver to define ADDRESS_MAP_MODERN, and fixed
36  keyboard. [Curt Coder]
37
3538- [C64] Added known good dumps softlist for cartridges. Not hooked up
3639  to driver code yet. [Curt Coder]
3740

Previous 15994 Revisions Next


© 1998-2018 The MESS Team