Previous 15994 Revisions Next

r11058 Sunday 3rd April, 2011 at 13:14:21 UTC by Curt Coder
[OSI] Modernized driver.
[src/mess/drivers]osi.c
[src/mess/includes]osi.h
[src/mess/video]osi.c

src/mess/video/osi.c
r11057r11058
1#include "emu.h"
21#include "includes/osi.h"
32
43/* Palette Initialization */
r11057r11058
2221
2322/* Video Start */
2423
25static VIDEO_START( osi600 )
24void sb2m600_state::video_start()
2625{
27   osi_state *state = machine.driver_data<osi_state>();
2826   UINT16 addr;
2927
3028   /* randomize video memory contents */
3129   for (addr = 0; addr < OSI600_VIDEORAM_SIZE; addr++)
3230   {
33      state->m_video_ram[addr] = machine.rand() & 0xff;
31      m_video_ram[addr] = m_machine.rand() & 0xff;
3432   }
3533
3634   /* randomize color memory contents */
37   if (state->m_color_ram)
35   if (m_color_ram)
3836   {
3937      for (addr = 0; addr < OSI630_COLORRAM_SIZE; addr++)
4038      {
41         state->m_color_ram[addr] = machine.rand() & 0x0f;
39         m_color_ram[addr] = m_machine.rand() & 0x0f;
4240      }
4341   }
4442}
4543
4644/* Video Update */
4745
48static SCREEN_UPDATE( osi600 )
46bool sb2m600_state::screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect)
4947{
50   osi_state *state = screen->machine().driver_data<osi_state>();
51
5248   int y, bit, sx;
5349
54   if (state->m_32)
50   if (m_32)
5551   {
5652      for (y = 0; y < 256; y++)
5753      {
r11057r11058
6157
6258         for (sx = 0; sx < 64; sx++)
6359         {
64            UINT8 videoram_data = state->m_video_ram[videoram_addr];
60            UINT8 videoram_data = m_video_ram[videoram_addr];
6561            UINT16 charrom_addr = ((videoram_data << 3) | line) & 0x7ff;
66            UINT8 charrom_data = screen->machine().region("chargen")->base()[charrom_addr];
62            UINT8 charrom_data = m_machine.region("chargen")->base()[charrom_addr];
6763
6864            for (bit = 0; bit < 8; bit++)
6965            {
7066               int color = BIT(charrom_data, 7);
7167
72               if (state->m_coloren)
68               if (m_coloren)
7369               {
74                  UINT8 colorram_data = state->m_color_ram[videoram_addr];
70                  UINT8 colorram_data = m_color_ram[videoram_addr];
7571                  color = (color ^ BIT(colorram_data, 0)) ? (((colorram_data >> 1) & 0x07) + 2) : 0;
7672               }
7773
78               *BITMAP_ADDR16(bitmap, y, x++) = color;
74               *BITMAP_ADDR16(&bitmap, y, x++) = color;
7975
8076               charrom_data <<= 1;
8177            }
r11057r11058
9490
9591         for (sx = 0; sx < 32; sx++)
9692         {
97            UINT8 videoram_data = state->m_video_ram[videoram_addr];
93            UINT8 videoram_data = m_video_ram[videoram_addr];
9894            UINT16 charrom_addr = ((videoram_data << 3) | line) & 0x7ff;
99            UINT8 charrom_data = screen->machine().region("chargen")->base()[charrom_addr];
95            UINT8 charrom_data = m_machine.region("chargen")->base()[charrom_addr];
10096
10197            for (bit = 0; bit < 8; bit++)
10298            {
10399               int color = BIT(charrom_data, 7);
104100
105               if (state->m_coloren)
101               if (m_coloren)
106102               {
107                  UINT8 colorram_data = state->m_color_ram[videoram_addr];
103                  UINT8 colorram_data = m_color_ram[videoram_addr];
108104                  color = (color ^ BIT(colorram_data, 0)) ? (((colorram_data >> 1) & 0x07) + 2) : 0;
109105               }
110106
111               *BITMAP_ADDR16(bitmap, y, x++) = color;
112               *BITMAP_ADDR16(bitmap, y, x++) = color;
107               *BITMAP_ADDR16(&bitmap, y, x++) = color;
108               *BITMAP_ADDR16(&bitmap, y, x++) = color;
113109
114110               charrom_data <<= 1;
115111            }
r11057r11058
122118   return 0;
123119}
124120
125static SCREEN_UPDATE( uk101 )
121bool uk101_state::screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect)
126122{
127   osi_state *state = screen->machine().driver_data<osi_state>();
128
129123   int y, bit, sx;
130124
131125   for (y = 0; y < 256; y++)
r11057r11058
136130
137131      for (sx = 0; sx < 64; sx++)
138132      {
139         UINT8 videoram_data = state->m_video_ram[videoram_addr++];
133         UINT8 videoram_data = m_video_ram[videoram_addr++];
140134         UINT16 charrom_addr = ((videoram_data << 3) | line) & 0x7ff;
141         UINT8 charrom_data = screen->machine().region("chargen")->base()[charrom_addr];
135         UINT8 charrom_data = m_machine.region("chargen")->base()[charrom_addr];
142136
143137         for (bit = 0; bit < 8; bit++)
144138         {
145            *BITMAP_ADDR16(bitmap, y, x) = BIT(charrom_data, 7);
139            *BITMAP_ADDR16(&bitmap, y, x) = BIT(charrom_data, 7);
146140            x++;
147141            charrom_data <<= 1;
148142         }
r11057r11058
160154   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
161155   MCFG_SCREEN_SIZE(64*8, 32*8)
162156   MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0, 32*8-1)
163   MCFG_SCREEN_UPDATE(osi600)
164157
165158   MCFG_PALETTE_LENGTH(2)
166159   MCFG_PALETTE_INIT(black_and_white)
167
168   MCFG_VIDEO_START(osi600)
169160MACHINE_CONFIG_END
170161
171162MACHINE_CONFIG_FRAGMENT( uk101_video )
r11057r11058
174165   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
175166   MCFG_SCREEN_SIZE(64*8, 16*16)
176167   MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*16-1)
177   MCFG_SCREEN_UPDATE(uk101)
178168
179169   MCFG_PALETTE_LENGTH(2)
180170   MCFG_PALETTE_INIT(black_and_white)
181
182   MCFG_VIDEO_START(osi600)
183171MACHINE_CONFIG_END
184172
185173MACHINE_CONFIG_FRAGMENT( osi630_video )
r11057r11058
188176   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
189177   MCFG_SCREEN_SIZE(64*8, 16*16)
190178   MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*16-1)
191   MCFG_SCREEN_UPDATE(osi600)
192179
193180   MCFG_PALETTE_LENGTH(8+2)
194181   MCFG_PALETTE_INIT(osi630)
195
196   MCFG_VIDEO_START(osi600)
197182MACHINE_CONFIG_END
src/mess/includes/osi.h
r11057r11058
1#pragma once
2
13#ifndef __OSI__
24#define __OSI__
35
6#define ADDRESS_MAP_MODERN
7
8#include "emu.h"
9#include "cpu/m6502/m6502.h"
10#include "formats/basicdsk.h"
11#include "imagedev/cassette.h"
12#include "imagedev/flopdrv.h"
13#include "machine/6850acia.h"
14#include "machine/6821pia.h"
15#include "machine/ram.h"
16#include "sound/discrete.h"
17#include "sound/beep.h"
18
419#define SCREEN_TAG      "screen"
520#define M6502_TAG      "m6502"
21#define DISCRETE_TAG   "discrete"
22#define BEEP_TAG      "beep"
623#define CASSETTE_TAG   "cassette"
724
825#define X1         3932160
r11057r11058
1128#define OSI600_VIDEORAM_SIZE   0x400
1229#define OSI630_COLORRAM_SIZE   0x400
1330
14class osi_state : public driver_device
31class sb2m600_state : public driver_device
1532{
1633public:
17   osi_state(running_machine &machine, const driver_device_config_base &config)
18      : driver_device(machine, config) { }
34   sb2m600_state(running_machine &machine, const driver_device_config_base &config)
35      : driver_device(machine, config),
36        m_maincpu(*this, M6502_TAG),
37        m_cassette(*this, CASSETTE_TAG),
38        m_discrete(*this, DISCRETE_TAG),
39        m_ram(*this, RAM_TAG)
40   { }
1941
42   required_device<cpu_device> m_maincpu;
43   required_device<device_t> m_cassette;
44   optional_device<device_t> m_discrete;
45   required_device<device_t> m_ram;
46
47   virtual void machine_start();
48
49   virtual void video_start();
50   virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
51
52   DECLARE_READ8_MEMBER( keyboard_r );
53   DECLARE_WRITE8_MEMBER( keyboard_w );
54   DECLARE_WRITE8_MEMBER( ctrl_w );
55   DECLARE_READ_LINE_MEMBER( cassette_rx );
56   DECLARE_WRITE_LINE_MEMBER( cassette_tx );
57
2058   /* keyboard state */
2159   UINT8 m_keylatch;
2260
r11057r11058
2866
2967   /* floppy state */
3068   int m_fdc_index;
69};
3170
32   /* devices */
33   device_t *m_cassette;
71class c1p_state : public sb2m600_state
72{
73public:
74   c1p_state(running_machine &machine, const driver_device_config_base &config)
75      : sb2m600_state(machine, config),
76        m_beep(*this, BEEP_TAG)
77   { }
78
79   required_device<device_t> m_beep;
80
81   virtual void machine_start();
82
83   DECLARE_WRITE8_MEMBER( osi630_ctrl_w );
84   DECLARE_WRITE8_MEMBER( osi630_sound_w );
3485};
3586
87class c1pmf_state : public c1p_state
88{
89public:
90   c1pmf_state(running_machine &machine, const driver_device_config_base &config)
91      : c1p_state(machine, config),
92        m_floppy(*this, FLOPPY_0)
93   { }
94
95   required_device<device_t> m_floppy;
96
97   virtual void machine_start();
98
99   DECLARE_READ8_MEMBER( osi470_pia_pa_r );
100   DECLARE_WRITE8_MEMBER( osi470_pia_pa_w );
101   DECLARE_WRITE8_MEMBER( osi470_pia_pb_w );
102   DECLARE_WRITE_LINE_MEMBER( osi470_pia_cb2_w );
103};
104
105class uk101_state : public sb2m600_state
106{
107public:
108   uk101_state(running_machine &machine, const driver_device_config_base &config)
109      : sb2m600_state(machine, config)
110   { }
111
112   virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
113
114   DECLARE_WRITE8_MEMBER( keyboard_w );
115};
116
36117/* ---------- defined in video/osi.c ---------- */
37118
38119MACHINE_CONFIG_EXTERN( osi600_video );
src/mess/drivers/osi.c
r11057r11058
176176
177177*/
178178
179#include "emu.h"
180#include "cpu/m6502/m6502.h"
181179#include "includes/osi.h"
182#include "machine/6850acia.h"
183#include "machine/6821pia.h"
184#include "sound/discrete.h"
185#include "sound/beep.h"
186#include "imagedev/flopdrv.h"
187#include "formats/basicdsk.h"
188#include "imagedev/cassette.h"
189#include "machine/ram.h"
190180
191181/* Sound */
192182
r11057r11058
231221
232222/* Keyboard */
233223
234static READ8_HANDLER( osi600_keyboard_r )
224READ8_MEMBER( sb2m600_state::keyboard_r )
235225{
236   osi_state *state = space->machine().driver_data<osi_state>();
237
238226   static const char *const keynames[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" };
239227
240228   UINT8 data = 0xff;
r11057r11058
242230
243231   for (bit = 0; bit < 8; bit++)
244232   {
245      if (!BIT(state->m_keylatch, bit)) data &= input_port_read(space->machine(), keynames[bit]);
233      if (!BIT(m_keylatch, bit)) data &= input_port_read(m_machine, keynames[bit]);
246234   }
247235
248236   return data;
249237}
250238
251static WRITE8_HANDLER( osi600_keyboard_w )
239WRITE8_MEMBER( sb2m600_state::keyboard_w )
252240{
253   device_t *discrete = space->machine().device("discrete");
254   osi_state *state = space->machine().driver_data<osi_state>();
241   m_keylatch = data;
255242
256   state->m_keylatch = data;
257
258   discrete_sound_w(discrete, NODE_01, (data >> 2) & 0x0f);
243   discrete_sound_w(m_discrete, NODE_01, (data >> 2) & 0x0f);
259244}
260245
261static WRITE8_HANDLER( uk101_keyboard_w )
246WRITE8_MEMBER( uk101_state::keyboard_w )
262247{
263   osi_state *state = space->machine().driver_data<osi_state>();
264
265   state->m_keylatch = data;
248   m_keylatch = data;
266249}
267250
268static WRITE8_HANDLER( osi600_ctrl_w )
251WRITE8_MEMBER( sb2m600_state::ctrl_w )
269252{
270253   /*
271254
r11057r11058
282265
283266    */
284267
285   device_t *discrete = space->machine().device("discrete");
286   osi_state *state = space->machine().driver_data<osi_state>();
268   m_32 = BIT(data, 0);
269   m_coloren = BIT(data, 1);
287270
288   state->m_32 = BIT(data, 0);
289   state->m_coloren = BIT(data, 1);
290
291   discrete_sound_w(discrete, NODE_10, BIT(data, 4));
271   discrete_sound_w(m_discrete, NODE_10, BIT(data, 4));
292272}
293273
294static WRITE8_HANDLER( osi630_ctrl_w )
274WRITE8_MEMBER( c1p_state::osi630_ctrl_w )
295275{
296   device_t *speaker = space->machine().device("beep");
297276   /*
298277
299278        bit     description
r11057r11058
309288
310289    */
311290
312   beep_set_state(speaker, BIT(data, 1));
291   beep_set_state(m_beep, BIT(data, 1));
313292}
314293
315static WRITE8_HANDLER( osi630_sound_w )
294WRITE8_MEMBER( c1p_state::osi630_sound_w )
316295{
317   device_t *speaker = space->machine().device("beep");
318   if (data) beep_set_frequency(speaker, 49152/data);
296   if (data) beep_set_frequency(m_beep, 49152 / data);
319297}
320298
321299/* Disk Drive */
r11057r11058
356334
357335static void osi470_index_callback(device_t *controller, device_t *img, int state)
358336{
359   osi_state *driver_state = img->machine().driver_data<osi_state>();
337   sb2m600_state *driver_state = img->machine().driver_data<sb2m600_state>();
360338
361339   driver_state->m_fdc_index = state;
362340}
363341
364static READ8_DEVICE_HANDLER( osi470_pia_a_r )
342READ8_MEMBER( c1pmf_state::osi470_pia_pa_r )
365343{
366344
367345   /*
r11057r11058
379357
380358    */
381359
382   osi_state *state = device->machine().driver_data<osi_state>();
383
384   return (state->m_fdc_index << 7);
360   return (m_fdc_index << 7);
385361}
386362
387static WRITE8_DEVICE_HANDLER( osi470_pia_a_w )
363WRITE8_MEMBER( c1pmf_state::osi470_pia_pa_w )
388364{
389365   /*
390366
r11057r11058
402378    */
403379}
404380
405static WRITE8_DEVICE_HANDLER( osi470_pia_b_w )
381WRITE8_MEMBER( c1pmf_state::osi470_pia_pb_w )
406382{
407383   /*
408384
r11057r11058
420396    */
421397}
422398
423static WRITE8_DEVICE_HANDLER( osi470_pia_cb2_w )
399WRITE_LINE_MEMBER( c1pmf_state::osi470_pia_cb2_w )
424400{
425401}
426402
427403static const pia6821_interface osi470_pia_intf =
428404{
429   DEVCB_HANDLER(osi470_pia_a_r),
405   DEVCB_DRIVER_MEMBER(c1pmf_state, osi470_pia_pa_r),
430406   DEVCB_NULL, // read8_machine_func in_b_func,
431407   DEVCB_NULL, // read8_machine_func in_ca1_func,
432408   DEVCB_NULL, // read8_machine_func in_cb1_func,
433409   DEVCB_NULL, // read8_machine_func in_ca2_func,
434410   DEVCB_NULL, // read8_machine_func in_cb2_func,
435   DEVCB_HANDLER(osi470_pia_a_w),
436   DEVCB_HANDLER(osi470_pia_b_w),
411   DEVCB_DRIVER_MEMBER(c1pmf_state, osi470_pia_pa_w),
412   DEVCB_DRIVER_MEMBER(c1pmf_state, osi470_pia_pb_w),
437413   DEVCB_NULL, // write8_machine_func out_ca2_func,
438   DEVCB_HANDLER(osi470_pia_cb2_w),
414   DEVCB_DRIVER_LINE_MEMBER(c1pmf_state, osi470_pia_cb2_w),
439415   DEVCB_NULL, // void (*irq_a_func)(int state),
440416   DEVCB_NULL, // void (*irq_b_func)(int state),
441417};
r11057r11058
458434
459435/* Memory Maps */
460436
461static ADDRESS_MAP_START( osi600_mem, AS_PROGRAM, 8 )
437static ADDRESS_MAP_START( osi600_mem, AS_PROGRAM, 8, sb2m600_state )
462438   AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank1")
463439   AM_RANGE(0xa000, 0xbfff) AM_ROM
464   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE_MEMBER(osi_state, m_video_ram)
465   AM_RANGE(0xdf00, 0xdf00) AM_READWRITE(osi600_keyboard_r, osi600_keyboard_w)
466   AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("acia_0", acia6850_stat_r, acia6850_ctrl_w)
467   AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE("acia_0", acia6850_data_r, acia6850_data_w)
440   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE(m_video_ram)
441   AM_RANGE(0xdf00, 0xdf00) AM_READWRITE(keyboard_r, keyboard_w)
442   AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_stat_r, acia6850_ctrl_w)
443   AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_data_r, acia6850_data_w)
468444   AM_RANGE(0xf800, 0xffff) AM_ROM
469445ADDRESS_MAP_END
470446
471static ADDRESS_MAP_START( uk101_mem, AS_PROGRAM, 8 )
447static ADDRESS_MAP_START( uk101_mem, AS_PROGRAM, 8, uk101_state )
472448   AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank1")
473449   AM_RANGE(0xa000, 0xbfff) AM_ROM
474   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE_MEMBER(osi_state, m_video_ram)
475   AM_RANGE(0xdf00, 0xdf00) AM_MIRROR(0x03ff) AM_READWRITE(osi600_keyboard_r, uk101_keyboard_w)
476   AM_RANGE(0xf000, 0xf000) AM_MIRROR(0x00fe) AM_DEVREADWRITE("acia_0", acia6850_stat_r, acia6850_ctrl_w)
477   AM_RANGE(0xf001, 0xf001) AM_MIRROR(0x00fe) AM_DEVREADWRITE("acia_0", acia6850_data_r, acia6850_data_w)
450   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE(m_video_ram)
451   AM_RANGE(0xdf00, 0xdf00) AM_MIRROR(0x03ff) AM_READ_BASE(sb2m600_state, keyboard_r) AM_WRITE(keyboard_w)
452   AM_RANGE(0xf000, 0xf000) AM_MIRROR(0x00fe) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_stat_r, acia6850_ctrl_w)
453   AM_RANGE(0xf001, 0xf001) AM_MIRROR(0x00fe) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_data_r, acia6850_data_w)
478454   AM_RANGE(0xf800, 0xffff) AM_ROM
479455ADDRESS_MAP_END
480456
481static ADDRESS_MAP_START( c1p_mem, AS_PROGRAM, 8 )
457static ADDRESS_MAP_START( c1p_mem, AS_PROGRAM, 8, c1p_state )
482458   AM_RANGE(0x0000, 0x4fff) AM_RAMBANK("bank1")
483459   AM_RANGE(0xa000, 0xbfff) AM_ROM
484   AM_RANGE(0xc704, 0xc707) AM_DEVREADWRITE("pia_1", pia6821_r, pia6821_w)
485   AM_RANGE(0xc708, 0xc70b) AM_DEVREADWRITE("pia_2", pia6821_r, pia6821_w)
486   AM_RANGE(0xc70c, 0xc70f) AM_DEVREADWRITE("pia_3", pia6821_r, pia6821_w)
487   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE_MEMBER(osi_state, m_video_ram)
488   AM_RANGE(0xd400, 0xd7ff) AM_RAM AM_BASE_MEMBER(osi_state, m_color_ram)
489   AM_RANGE(0xd800, 0xd800) AM_WRITE(osi600_ctrl_w)
490   AM_RANGE(0xdf00, 0xdf00) AM_READWRITE(osi600_keyboard_r, osi600_keyboard_w)
491   AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("acia_0", acia6850_stat_r, acia6850_ctrl_w)
492   AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE("acia_0", acia6850_data_r, acia6850_data_w)
460   AM_RANGE(0xc704, 0xc707) AM_DEVREADWRITE_LEGACY("pia_1", pia6821_r, pia6821_w)
461   AM_RANGE(0xc708, 0xc70b) AM_DEVREADWRITE_LEGACY("pia_2", pia6821_r, pia6821_w)
462   AM_RANGE(0xc70c, 0xc70f) AM_DEVREADWRITE_LEGACY("pia_3", pia6821_r, pia6821_w)
463   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE(m_video_ram)
464   AM_RANGE(0xd400, 0xd7ff) AM_RAM AM_BASE(m_color_ram)
465   AM_RANGE(0xd800, 0xd800) AM_WRITE_BASE(sb2m600_state, ctrl_w)
466   AM_RANGE(0xdf00, 0xdf00) AM_READWRITE_BASE(sb2m600_state, keyboard_r, keyboard_w)
467   AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_stat_r, acia6850_ctrl_w)
468   AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_data_r, acia6850_data_w)
493469   AM_RANGE(0xf7c0, 0xf7c0) AM_WRITE(osi630_sound_w)
494470   AM_RANGE(0xf7e0, 0xf7e0) AM_WRITE(osi630_ctrl_w)
495471   AM_RANGE(0xf800, 0xffff) AM_ROM
496472ADDRESS_MAP_END
497473
498static ADDRESS_MAP_START( c1pmf_mem, AS_PROGRAM, 8 )
474static ADDRESS_MAP_START( c1pmf_mem, AS_PROGRAM, 8, c1pmf_state )
499475   AM_RANGE(0x0000, 0x4fff) AM_RAMBANK("bank1")
500476   AM_RANGE(0xa000, 0xbfff) AM_ROM
501   AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("pia_0", pia6821_r, pia6821_w) // FDC
502   AM_RANGE(0xc010, 0xc010) AM_DEVREADWRITE("acia_1", acia6850_stat_r, acia6850_ctrl_w)
503   AM_RANGE(0xc011, 0xc011) AM_DEVREADWRITE("acia_1", acia6850_data_r, acia6850_data_w)
504   AM_RANGE(0xc704, 0xc707) AM_DEVREADWRITE("pia_1", pia6821_r, pia6821_w)
505   AM_RANGE(0xc708, 0xc70b) AM_DEVREADWRITE("pia_2", pia6821_r, pia6821_w)
506   AM_RANGE(0xc70c, 0xc70f) AM_DEVREADWRITE("pia_3", pia6821_r, pia6821_w)
507   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE_MEMBER(osi_state, m_video_ram)
508   AM_RANGE(0xd400, 0xd7ff) AM_RAM AM_BASE_MEMBER(osi_state, m_color_ram)
509   AM_RANGE(0xd800, 0xd800) AM_WRITE(osi600_ctrl_w)
510   AM_RANGE(0xdf00, 0xdf00) AM_READWRITE(osi600_keyboard_r, osi600_keyboard_w)
511   AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("acia_0", acia6850_stat_r, acia6850_ctrl_w)
512   AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE("acia_0", acia6850_data_r, acia6850_data_w)
513   AM_RANGE(0xf7c0, 0xf7c0) AM_WRITE(osi630_sound_w)
514   AM_RANGE(0xf7e0, 0xf7e0) AM_WRITE(osi630_ctrl_w)
477   AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE_LEGACY("pia_0", pia6821_r, pia6821_w) // FDC
478   AM_RANGE(0xc010, 0xc010) AM_DEVREADWRITE_LEGACY("acia_1", acia6850_stat_r, acia6850_ctrl_w)
479   AM_RANGE(0xc011, 0xc011) AM_DEVREADWRITE_LEGACY("acia_1", acia6850_data_r, acia6850_data_w)
480   AM_RANGE(0xc704, 0xc707) AM_DEVREADWRITE_LEGACY("pia_1", pia6821_r, pia6821_w)
481   AM_RANGE(0xc708, 0xc70b) AM_DEVREADWRITE_LEGACY("pia_2", pia6821_r, pia6821_w)
482   AM_RANGE(0xc70c, 0xc70f) AM_DEVREADWRITE_LEGACY("pia_3", pia6821_r, pia6821_w)
483   AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE(m_video_ram)
484   AM_RANGE(0xd400, 0xd7ff) AM_RAM AM_BASE(m_color_ram)
485   AM_RANGE(0xd800, 0xd800) AM_WRITE_BASE(sb2m600_state, ctrl_w)
486   AM_RANGE(0xdf00, 0xdf00) AM_READWRITE_BASE(sb2m600_state, keyboard_r, keyboard_w)
487   AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_stat_r, acia6850_ctrl_w)
488   AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE_LEGACY("acia_0", acia6850_data_r, acia6850_data_w)
489   AM_RANGE(0xf7c0, 0xf7c0) AM_WRITE_BASE(c1p_state, osi630_sound_w)
490   AM_RANGE(0xf7e0, 0xf7e0) AM_WRITE_BASE(c1p_state, osi630_ctrl_w)
515491   AM_RANGE(0xf800, 0xffff) AM_ROM
516492ADDRESS_MAP_END
517493
r11057r11058
613589
614590/* Machine Start */
615591
616static READ_LINE_DEVICE_HANDLER( cassette_rx )
592READ_LINE_MEMBER( sb2m600_state::cassette_rx )
617593{
618   osi_state *driver_state = device->machine().driver_data<osi_state>();
619
620   return (cassette_input(driver_state->m_cassette) > 0.0) ? 1 : 0;
594   return (cassette_input(m_cassette) > 0.0) ? 1 : 0;
621595}
622596
623static WRITE_LINE_DEVICE_HANDLER( cassette_tx )
597WRITE_LINE_MEMBER( sb2m600_state::cassette_tx )
624598{
625   osi_state *driver_state = device->machine().driver_data<osi_state>();
626
627   cassette_output(driver_state->m_cassette, state ? +1.0 : -1.0);
599   cassette_output(m_cassette, state ? +1.0 : -1.0);
628600}
629601
630602static ACIA6850_INTERFACE( osi600_acia_intf )
631603{
632604   X1/32,
633605   X1/32,
634   DEVCB_LINE(cassette_rx),
635   DEVCB_LINE(cassette_tx),
606   DEVCB_DRIVER_LINE_MEMBER(sb2m600_state, cassette_rx),
607   DEVCB_DRIVER_LINE_MEMBER(sb2m600_state, cassette_tx),
636608   DEVCB_NULL,
637609   DEVCB_NULL,
638610   DEVCB_NULL,
r11057r11058
643615{
644616   500000, //
645617   500000, //
646   DEVCB_LINE(cassette_rx),
647   DEVCB_LINE(cassette_tx),
618   DEVCB_DRIVER_LINE_MEMBER(sb2m600_state, cassette_rx),
619   DEVCB_DRIVER_LINE_MEMBER(sb2m600_state, cassette_tx),
648620   DEVCB_NULL,
649621   DEVCB_NULL,
650622   DEVCB_NULL,
r11057r11058
663635   DEVCB_NULL
664636};
665637
666static MACHINE_START( osi600 )
638void sb2m600_state::machine_start()
667639{
668   osi_state *state = machine.driver_data<osi_state>();
640   address_space *program = m_maincpu->memory().space(AS_PROGRAM);
669641
670   address_space *program = machine.device(M6502_TAG)->memory().space(AS_PROGRAM);
671
672   /* find devices */
673   state->m_cassette = machine.device(CASSETTE_TAG);
674
675642   /* configure RAM banking */
676   memory_configure_bank(machine, "bank1", 0, 1, machine.region(M6502_TAG)->base(), 0);
677   memory_set_bank(machine, "bank1", 0);
643   memory_configure_bank(m_machine, "bank1", 0, 1, m_machine.region(M6502_TAG)->base(), 0);
644   memory_set_bank(m_machine, "bank1", 0);
678645
679   switch (ram_get_size(machine.device(RAM_TAG)))
646   switch (ram_get_size(m_ram))
680647   {
681648   case 4*1024:
682649      program->install_readwrite_bank(0x0000, 0x0fff, "bank1");
r11057r11058
689656   }
690657
691658   /* register for state saving */
692   state->save_item(NAME(state->m_keylatch));
693   state->save_pointer(NAME(state->m_video_ram), OSI600_VIDEORAM_SIZE);
659   save_item(NAME(m_keylatch));
660   save_pointer(NAME(m_video_ram), OSI600_VIDEORAM_SIZE);
694661}
695662
696static MACHINE_START( c1p )
663void c1p_state::machine_start()
697664{
698   osi_state *state = machine.driver_data<osi_state>();
665   address_space *program = m_maincpu->memory().space(AS_PROGRAM);
699666
700   address_space *program = machine.device(M6502_TAG)->memory().space(AS_PROGRAM);
701
702   /* find devices */
703   state->m_cassette = machine.device(CASSETTE_TAG);
704
705667   /* configure RAM banking */
706   memory_configure_bank(machine, "bank1", 0, 1, machine.region(M6502_TAG)->base(), 0);
707   memory_set_bank(machine, "bank1", 0);
668   memory_configure_bank(m_machine, "bank1", 0, 1, m_machine.region(M6502_TAG)->base(), 0);
669   memory_set_bank(m_machine, "bank1", 0);
708670
709   switch (ram_get_size(machine.device(RAM_TAG)))
671   switch (ram_get_size(m_ram))
710672   {
711673   case 8*1024:
712674      program->install_readwrite_bank(0x0000, 0x1fff, "bank1");
r11057r11058
719681   }
720682
721683   /* register for state saving */
722   state->save_item(NAME(state->m_keylatch));
723   state->save_item(NAME(state->m_32));
724   state->save_item(NAME(state->m_coloren));
725   state->save_pointer(NAME(state->m_video_ram), OSI600_VIDEORAM_SIZE);
726   state->save_pointer(NAME(state->m_color_ram), OSI630_COLORRAM_SIZE);
684   save_item(NAME(m_keylatch));
685   save_item(NAME(m_32));
686   save_item(NAME(m_coloren));
687   save_pointer(NAME(m_video_ram), OSI600_VIDEORAM_SIZE);
688   save_pointer(NAME(m_color_ram), OSI630_COLORRAM_SIZE);
727689}
728690
729static MACHINE_START( c1pmf )
691void c1pmf_state::machine_start()
730692{
731   MACHINE_START_CALL(c1p);
693   c1p_state::machine_start();
732694
733695   /* set floppy index hole callback */
734   floppy_drive_set_index_pulse_callback(floppy_get_device(machine, 0), osi470_index_callback);
696   floppy_drive_set_index_pulse_callback(m_floppy, osi470_index_callback);
735697}
736698
737699static FLOPPY_OPTIONS_START(osi)
r11057r11058
773735   GFXDECODE_ENTRY( "chargen", 0x0000, osi_charlayout, 0, 1 )
774736GFXDECODE_END
775737
776
777738/* Machine Drivers */
778739
779static MACHINE_CONFIG_START( osi600, osi_state )
780
740static MACHINE_CONFIG_START( osi600, sb2m600_state )
781741   /* basic machine hardware */
782742   MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
783743   MCFG_CPU_PROGRAM_MAP(osi600_mem)
784744
785   MCFG_MACHINE_START(osi600)
786
787745   /* video hardware */
788746   MCFG_FRAGMENT_ADD(osi600_video)
789747   MCFG_GFXDECODE(osi)
790748
791749   /* sound hardware */
792750   MCFG_SPEAKER_STANDARD_MONO("mono")
793   MCFG_SOUND_ADD("discrete", DISCRETE, 0)
751   MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
794752   MCFG_SOUND_CONFIG_DISCRETE(osi600_discrete_interface)
795753   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
796754
r11057r11058
798756   MCFG_ACIA6850_ADD("acia_0", osi600_acia_intf)
799757
800758   /* cassette */
801   MCFG_CASSETTE_ADD("cassette", default_cassette_config)
759   MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_config)
802760
803761   /* internal ram */
804762   MCFG_RAM_ADD(RAM_TAG)
r11057r11058
806764   MCFG_RAM_EXTRA_OPTIONS("8K")
807765MACHINE_CONFIG_END
808766
809static MACHINE_CONFIG_START( uk101, osi_state )
810
767static MACHINE_CONFIG_START( uk101, uk101_state )
811768   /* basic machine hardware */
812769   MCFG_CPU_ADD(M6502_TAG, M6502, UK101_X1/8) // 1 MHz
813770   MCFG_CPU_PROGRAM_MAP(uk101_mem)
814771
815   MCFG_MACHINE_START(osi600)
816
817772   /* video hardware */
818773   MCFG_FRAGMENT_ADD(uk101_video)
819774   MCFG_GFXDECODE(osi)
r11057r11058
822777   MCFG_ACIA6850_ADD("acia_0", uk101_acia_intf)
823778
824779   /* cassette */
825   MCFG_CASSETTE_ADD("cassette", default_cassette_config)
780   MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_config)
826781
827782   /* internal ram */
828783   MCFG_RAM_ADD(RAM_TAG)
r11057r11058
830785   MCFG_RAM_EXTRA_OPTIONS("8K")
831786MACHINE_CONFIG_END
832787
833static MACHINE_CONFIG_START( c1p, osi_state )
834
788static MACHINE_CONFIG_START( c1p, c1p_state )
835789   /* basic machine hardware */
836790   MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
837791   MCFG_CPU_PROGRAM_MAP(c1p_mem)
838792
839   MCFG_MACHINE_START(c1p)
840
841793   /* video hardware */
842794   MCFG_FRAGMENT_ADD(osi630_video)
843795   MCFG_GFXDECODE(osi)
844796
845797   /* sound hardware */
846798   MCFG_SPEAKER_STANDARD_MONO("mono")
847   MCFG_SOUND_ADD("discrete", DISCRETE, 0)
799   MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
848800   MCFG_SOUND_CONFIG_DISCRETE(osi600c_discrete_interface)
849801   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
850   MCFG_SOUND_ADD("beep", BEEP, 0)
802   MCFG_SOUND_ADD(BEEP_TAG, BEEP, 0)
851803   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
852804
853805   MCFG_PIA6821_ADD( "pia_1", pia_dummy_intf )
r11057r11058
858810   MCFG_ACIA6850_ADD("acia_0", osi600_acia_intf)
859811
860812   /* cassette */
861   MCFG_CASSETTE_ADD("cassette", default_cassette_config)
813   MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_config)
862814
863815   /* internal ram */
864816   MCFG_RAM_ADD(RAM_TAG)
r11057r11058
866818   MCFG_RAM_EXTRA_OPTIONS("20K")
867819MACHINE_CONFIG_END
868820
869static MACHINE_CONFIG_DERIVED( c1pmf, c1p )
870
821static MACHINE_CONFIG_DERIVED_CLASS( c1pmf, c1p, c1pmf_state )
871822   MCFG_CPU_MODIFY(M6502_TAG)
872823   MCFG_CPU_PROGRAM_MAP(c1pmf_mem)
873824
874   MCFG_MACHINE_START(c1pmf)
875
876825   MCFG_PIA6821_ADD( "pia_0", osi470_pia_intf )
877826
878827   /* floppy ACIA */
r11057r11058
918867
919868static TIMER_CALLBACK( setup_beep )
920869{
921   device_t *speaker = machine.device("beep");
870   device_t *speaker = machine.device(BEEP_TAG);
922871   beep_set_state(speaker, 0);
923872   beep_set_frequency(speaker, 300);
924873}
r11057r11058
931880
932881/* System Drivers */
933882
934//    YEAR  NAME        PARENT      COMPAT  MACHINE     INPUT       INIT        COMPANY            FULLNAME
935COMP( 1978, sb2m600b,   0,      0,   osi600,   osi600,    0,      "Ohio Scientific", "Superboard II Model 600 (Rev. B)", GAME_NOT_WORKING)
883//    YEAR  NAME        PARENT  COMPAT  MACHINE   INPUT      INIT   COMPANY            FULLNAME
884COMP( 1978, sb2m600b,   0,      0,      osi600,   osi600,    0,      "Ohio Scientific", "Superboard II Model 600 (Rev. B)", GAME_NOT_WORKING)
936885//COMP( 1980, sb2m600c, 0,          0,      osi600c,  osi600,    0,     "Ohio Scientific", "Superboard II Model 600 (Rev. C)", GAME_NOT_WORKING)
937COMP( 1980, c1p,   sb2m600b,   0,   c1p,     osi600,    c1p,   "Ohio Scientific", "Challenger 1P Series 2", GAME_NOT_WORKING)
938COMP( 1980, c1pmf,   sb2m600b,   0,   c1pmf,     osi600,    c1p,   "Ohio Scientific", "Challenger 1P MF Series 2", GAME_NOT_WORKING)
939COMP( 1979, uk101,   sb2m600b,   0,   uk101,     uk101,     0,    "Compukit",        "UK101", GAME_NOT_WORKING | GAME_NO_SOUND)
886COMP( 1980, c1p,   sb2m600b,   0,      c1p,     osi600,    c1p,   "Ohio Scientific", "Challenger 1P Series 2", GAME_NOT_WORKING)
887COMP( 1980, c1pmf,   sb2m600b,   0,      c1pmf,     osi600,    c1p,   "Ohio Scientific", "Challenger 1P MF Series 2", GAME_NOT_WORKING)
888COMP( 1979, uk101,   sb2m600b,   0,      uk101,     uk101,     0,    "Compukit",        "UK101", GAME_NOT_WORKING | GAME_NO_SOUND)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team