Previous 15994 Revisions Next

r4018 Tuesday 30th December, 2008 at 12:42:20 UTC by Miodrag Milanović
[CBMB][PET] Used driver state
[src/mess/drivers]cbmb.c pet.c
[src/mess/includes]cbmb.h pet.h
[src/mess/machine]cbmb.c pet.c
[src/mess/video]cbmb.c

src/mess/video/cbmb.c
r4017r4018
4848
4949VIDEO_START( cbm700 )
5050{
51   int i;
51   int i;   
5252
5353    /* remove pixel column 9 for character codes 0 - 175 and 224 - 255 */
54   for( i = 0; i < 256; i++)
54   for( i = 0; i < 256; i++)   
5555   {
5656//      if( i < 176 || i > 223 )
5757      {
src/mess/includes/cbmb.h
r4017r4018
1515#include "machine/6526cia.h"
1616#include "devices/cartslot.h"
1717
18typedef struct _cbmb_state cbmb_state;
19struct _cbmb_state
20{
21   /* keyboard lines */
22   int cbmb_keyline_a;
23   int cbmb_keyline_b;
24   int cbmb_keyline_c;
25   
26   int p500;
27   int cbm700;
28   int cbm_ntsc;
29};
30
1831/*----------- defined in machine/cbmb.c -----------*/
1932
2033extern UINT8 *cbmb_basic;
src/mess/includes/pet.h
r4017r4018
1111#include "machine/6522via.h"
1212#include "devices/cartslot.h"
1313
14typedef struct _pet_state pet_state;
15struct _pet_state
16{
17   int pet_basic1; /* basic version 1 for quickloader */
18   int superpet;
19   int cbm8096;
20};
21
1422/*----------- defined in video/pet.c -----------*/
1523
1624/* call to init videodriver */
src/mess/machine/cbmb.c
r4017r4018
3838
3939static TIMER_CALLBACK(cbmb_frame_interrupt);
4040
41/* keyboard lines */
42static int cbmb_keyline_a, cbmb_keyline_b, cbmb_keyline_c;
43
44static int p500 = 0;
45static int cbm700;
46static int cbm_ntsc;
4741UINT8 *cbmb_basic;
4842UINT8 *cbmb_kernal;
4943static UINT8 *cbmb_chargen;
r4017r4018
111105  port a7..a0 b7..b0 keyboard input */
112106WRITE8_DEVICE_HANDLER( cbmb_keyboard_line_select_a )
113107{
114   cbmb_keyline_a = data;
108   cbmb_state *state = device->machine->driver_data;
109   state->cbmb_keyline_a = data;
115110}
116111
117112WRITE8_DEVICE_HANDLER( cbmb_keyboard_line_select_b )
118113{
119   cbmb_keyline_b = data;
114   cbmb_state *state = device->machine->driver_data;
115   state->cbmb_keyline_b = data;
120116}
121117
122118WRITE8_DEVICE_HANDLER( cbmb_keyboard_line_select_c )
123119{
124   cbmb_keyline_c = data;
120   cbmb_state *state = device->machine->driver_data;
121   state->cbmb_keyline_c = data;
125122}
126123
127124READ8_DEVICE_HANDLER( cbmb_keyboard_line_a )
128125{
129126   int data = 0;
130   
131   if (!(cbmb_keyline_c & 0x01))
127   cbmb_state *state = device->machine->driver_data;   
128   if (!(state->cbmb_keyline_c & 0x01))
132129      data |= input_port_read(device->machine, "ROW0");
133130
134   if (!(cbmb_keyline_c & 0x02))
131   if (!(state->cbmb_keyline_c & 0x02))
135132      data |= input_port_read(device->machine, "ROW2");
136133
137   if (!(cbmb_keyline_c & 0x04))
134   if (!(state->cbmb_keyline_c & 0x04))
138135      data |= input_port_read(device->machine, "ROW4");
139136
140   if (!(cbmb_keyline_c & 0x08))
137   if (!(state->cbmb_keyline_c & 0x08))
141138      data |= input_port_read(device->machine, "ROW6");
142139
143   if (!(cbmb_keyline_c & 0x10))
140   if (!(state->cbmb_keyline_c & 0x10))
144141      data |= input_port_read(device->machine, "ROW8");
145142
146   if (!(cbmb_keyline_c & 0x20))
143   if (!(state->cbmb_keyline_c & 0x20))
147144      data |= input_port_read(device->machine, "ROW10");
148145
149146   return data ^0xff;
r4017r4018
152149READ8_DEVICE_HANDLER( cbmb_keyboard_line_b )
153150{
154151   int data = 0;
155   
156   if (!(cbmb_keyline_c & 0x01))
152   cbmb_state *state = device->machine->driver_data;   
153   if (!(state->cbmb_keyline_c & 0x01))
157154      data |= input_port_read(device->machine, "ROW1");
158155
159   if (!(cbmb_keyline_c & 0x02))
156   if (!(state->cbmb_keyline_c & 0x02))
160157      data |= input_port_read(device->machine, "ROW3");
161158
162   if (!(cbmb_keyline_c & 0x04))
159   if (!(state->cbmb_keyline_c & 0x04))
163160      data |= input_port_read(device->machine, "ROW5");
164161
165   if (!(cbmb_keyline_c & 0x08))
162   if (!(state->cbmb_keyline_c & 0x08))
166163      data |= input_port_read(device->machine, "ROW7");
167164
168   if (!(cbmb_keyline_c & 0x10))
165   if (!(state->cbmb_keyline_c & 0x10))
169166      data |= input_port_read(device->machine, "ROW9") | ((input_port_read(device->machine, "SPECIAL") & 0x04) ? 1 : 0 );
170167
171   if (!(cbmb_keyline_c & 0x20))
168   if (!(state->cbmb_keyline_c & 0x20))
172169      data |= input_port_read(device->machine, "ROW11");
173170
174171   return data ^0xff;
r4017r4018
177174READ8_DEVICE_HANDLER( cbmb_keyboard_line_c )
178175{
179176   int data = 0;
180
181   if ((input_port_read(device->machine, "ROW0") & ~cbmb_keyline_a) ||
182            (input_port_read(device->machine, "ROW1") & ~cbmb_keyline_b))
177   cbmb_state *state = device->machine->driver_data;   
178   if ((input_port_read(device->machine, "ROW0") & ~state->cbmb_keyline_a) ||
179            (input_port_read(device->machine, "ROW1") & ~state->cbmb_keyline_b))
183180       data |= 0x01;
184181
185   if ((input_port_read(device->machine, "ROW2") & ~cbmb_keyline_a) ||
186            (input_port_read(device->machine, "ROW3") & ~cbmb_keyline_b))
182   if ((input_port_read(device->machine, "ROW2") & ~state->cbmb_keyline_a) ||
183            (input_port_read(device->machine, "ROW3") & ~state->cbmb_keyline_b))
187184       data |= 0x02;
188185
189   if ((input_port_read(device->machine, "ROW4") & ~cbmb_keyline_a) ||
190            (input_port_read(device->machine, "ROW5") & ~cbmb_keyline_b))
186   if ((input_port_read(device->machine, "ROW4") & ~state->cbmb_keyline_a) ||
187            (input_port_read(device->machine, "ROW5") & ~state->cbmb_keyline_b))
191188       data |= 0x04;
192189
193   if ((input_port_read(device->machine, "ROW6") & ~cbmb_keyline_a) ||
194            (input_port_read(device->machine, "ROW7") & ~cbmb_keyline_b))
190   if ((input_port_read(device->machine, "ROW6") & ~state->cbmb_keyline_a) ||
191            (input_port_read(device->machine, "ROW7") & ~state->cbmb_keyline_b))
195192       data |= 0x08;
196193
197   if ((input_port_read(device->machine, "ROW8") & ~cbmb_keyline_a) ||
198            ((input_port_read(device->machine, "ROW9") | ((input_port_read(device->machine, "SPECIAL") & 0x04) ? 1 : 0)) & ~cbmb_keyline_b))
194   if ((input_port_read(device->machine, "ROW8") & ~state->cbmb_keyline_a) ||
195            ((input_port_read(device->machine, "ROW9") | ((input_port_read(device->machine, "SPECIAL") & 0x04) ? 1 : 0)) & ~state->cbmb_keyline_b))
199196       data |= 0x10;
200197
201   if ((input_port_read(device->machine, "ROW10") & ~cbmb_keyline_a) ||
202            (input_port_read(device->machine, "ROW11") & ~cbmb_keyline_b))
198   if ((input_port_read(device->machine, "ROW10") & ~state->cbmb_keyline_a) ||
199            (input_port_read(device->machine, "ROW11") & ~state->cbmb_keyline_b))
203200       data |= 0x20;
204201
205   if (!p500)
202   if (!state->p500)
206203   {
207      if (!cbm_ntsc)
204      if (!state->cbm_ntsc)
208205         data |= 0x40;
209206
210      if (!cbm700)
207      if (!state->cbm700)
211208         data |= 0x80;
212209   }
213210   return data ^0xff;
r4017r4018
287284
288285static void cbmb_common_driver_init(running_machine *machine)
289286{
287   cbmb_state *state = machine->driver_data;
290288   cbmb_chargen=memory_region(machine, "main") + 0x100000;
291289   /*    memset(c64_memory, 0, 0xfd00); */
292290
293291   timer_pulse(machine, ATTOTIME_IN_MSEC(10), NULL, 0, cbmb_frame_interrupt);
294292
295   p500 = 0;
296   cbm700 = 0;
293   state->p500 = 0;
294   state->cbm700 = 0;
297295   cbm_ieee_open();
298296}
299297
300298DRIVER_INIT( cbm600 )
301299{
302   cbmb_common_driver_init(machine);
303   cbm_ntsc = 1;
300   cbmb_state *state = machine->driver_data;
301   cbmb_common_driver_init(machine);   
302   state->cbm_ntsc = 1;
304303   cbm600_vh_init(machine);
305304}
306305
307306DRIVER_INIT( cbm600pal )
308307{
308   cbmb_state *state = machine->driver_data;
309309   cbmb_common_driver_init(machine);
310   cbm_ntsc = 0;
310   state->cbm_ntsc = 0;
311311   cbm600_vh_init(machine);
312312}
313313
314314DRIVER_INIT( cbm600hu )
315315{
316   cbmb_state *state = machine->driver_data;
316317   cbmb_common_driver_init(machine);
317   cbm_ntsc = 0;
318   state->cbm_ntsc = 0;
318319}
319320
320321DRIVER_INIT( cbm700 )
321322{
323   cbmb_state *state = machine->driver_data;
322324   cbmb_common_driver_init(machine);
323   cbm700 = 1;
324   cbm_ntsc = 0;
325   state->cbm700 = 1;
326   state->cbm_ntsc = 0;
325327   cbm700_vh_init(machine);
326328}
327329
328330DRIVER_INIT( p500 )
329331{
332   cbmb_state *state = machine->driver_data;
330333   cbmb_common_driver_init(machine);
331   p500 = 1;
332   cbm_ntsc = 1;
334   state->p500 = 1;
335   state->cbm_ntsc = 1;
333336   vic6567_init(0, 0, cbmb_dma_read, cbmb_dma_read_color, NULL);
334337}
335338
src/mess/machine/pet.c
r4017r4018
3131      } \
3232   } while (0)
3333
34/* keyboard lines */
35static int pet_basic1 = 0; /* basic version 1 for quickloader */
36static int superpet = 0;
37static int cbm8096 = 0;
38static int pet_keyline_select;
39
4034int pet_font = 0;
4135UINT8 *pet_memory;
4236UINT8 *superpet_memory;
4337UINT8 *pet_videoram;
4438static UINT8 *pet80_bank1_base;
39static int pet_keyline_select;   
4540
4641static emu_timer *datasette1_timer;
4742static emu_timer *datasette2_timer;
r4017r4018
8075  cb2 cassette 1 motor out
8176*/
8277static READ8_HANDLER ( pet_pia0_port_a_read )
83{
78{   
8479   int data = 0xf0 | pet_keyline_select;
8580
8681   if ((cassette_get_state(device_list_find_by_tag( space->machine->config->devicelist, CASSETTE, "cassette1" )) & CASSETTE_MASK_UISTATE) != CASSETTE_STOPPED)
r4017r4018
121116static READ8_HANDLER( petb_pia0_port_b_read )
122117{
123118   UINT8 data = 0xff;
119   pet_state *state = space->machine->driver_data;
124120   static const char *const keynames[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4",
125121                              "ROW5", "ROW6", "ROW7", "ROW8", "ROW9" };
126122   
r4017r4018
130126      /* Check for left-shift lock */
131127      /* 2008-05 FP: For some reason, superpet read it in the opposite way!! */
132128      /* While waiting for confirmation from docs, we add a workaround here. */
133      if (superpet)
129      if (state->superpet)
134130      {
135131         if ((pet_keyline_select == 6) && !(input_port_read(space->machine, "SPECIAL") & 0x80))
136132            data &= 0xfe;
r4017r4018
175171static void pet_irq (running_machine *machine, int level)
176172{
177173   static int old_level = 0;
178
174   pet_state *state = machine->driver_data;
179175   if (level != old_level)
180176   {
181177      DBG_LOG (3, "mos6502", ("irq %s\n", level ? "start" : "end"));
182      if (superpet)
178      if (state->superpet)
183179         cpu_set_input_line(machine->cpu[1], M6809_IRQ_LINE, level);
184180      cpu_set_input_line(machine->cpu[0], M6502_IRQ_LINE, level);
185181      old_level = level;
r4017r4018
583579static void pet_common_driver_init(running_machine *machine)
584580{
585581   int i;
582   pet_state *state = machine->driver_data;
586583
584   state->pet_basic1 = 0;
585   state->superpet = 0;
586   state->cbm8096 = 0;
587   
587588   /* BIG HACK; need to phase out this retarded memory management */
588589   if (!pet_memory)
589590      pet_memory = mess_ram;
r4017r4018
619620
620621DRIVER_INIT( pet2001 )
621622{
622   pet_basic1 = 1;
623   pet_state *state = machine->driver_data;
623624   pet_common_driver_init(machine);
625   state->pet_basic1 = 1;
624626   pia_config(machine, 0, &pet_pia0);
625627   pet_vh_init(machine);
626628}
r4017r4018
648650
649651DRIVER_INIT( pet80 )
650652{
651   cbm8096 = 1;
653   
654   pet_state *state = machine->driver_data;
652655   pet_memory = memory_region(machine, "main");
653656
654657   pet_common_driver_init(machine);
658   state->cbm8096 = 1;   
655659   pia_config(machine, 0, &petb_pia0);
656660   videoram = &pet_memory[0x8000];
657661   videoram_size = 0x800;
658662   pet80_vh_init(machine);
663   
659664}
660665
661666DRIVER_INIT( superpet )
662667{
663   superpet = 1;
668   
669   pet_state *state = machine->driver_data;
664670   pet_common_driver_init(machine);
671   state->superpet = 1;
665672   pia_config(machine, 0, &petb_pia0);
666673
667674   superpet_memory = auto_malloc(0x10000);
r4017r4018
674681
675682MACHINE_RESET( pet )
676683{
684   pet_state *state = machine->driver_data;
677685   pia_reset();
678
679   if (superpet)
686   
687   if (state->superpet)
680688   {
681689      spet.rom = 0;
682690      if (input_port_read(machine, "CFG") & 0x04)
r4017r4018
693701      }
694702   }
695703
696   if (cbm8096)
704   if (state->cbm8096)
697705   {
698706      if (input_port_read(machine, "CFG") & 0x08)
699707      {
r4017r4018
714722
715723INTERRUPT_GEN( pet_frame_interrupt )
716724{
717   if (superpet)
725   pet_state *state = device->machine->driver_data;
726   if (state->superpet)
718727   {
719728      if (input_port_read(device->machine, "CFG") & 0x04)
720729      {
src/mess/drivers/cbmb.c
r4017r4018
103103#include "machine/6526cia.h"
104104
105105#include "includes/cbm.h"
106#include "includes/cbmb.h"
106107#include "machine/cbmipt.h"
107108#include "video/vic6567.h"
108109#include "video/mc6845.h"
r4017r4018
381382
382383
383384static MACHINE_DRIVER_START( cbm600 )
385   MDRV_DRIVER_DATA(cbmb_state)
384386   /* basic machine hardware */
385387   MDRV_CPU_ADD("main", M6509, 7833600)        /* 7.8336 MHz */
386388   MDRV_CPU_PROGRAM_MAP(cbmb_readmem, cbmb_writemem)
r4017r4018
458460
459461
460462static MACHINE_DRIVER_START( p500 )
463   MDRV_DRIVER_DATA(cbmb_state)   
461464   /* basic machine hardware */
462465   MDRV_CPU_ADD("main", M6509, VIC6567_CLOCK)        /* 7.8336 MHz */
463466   MDRV_CPU_PROGRAM_MAP(p500_readmem, p500_writemem)
src/mess/drivers/pet.c
r4017r4018
649649 *************************************/
650650
651651static MACHINE_DRIVER_START( pet_general )
652   MDRV_DRIVER_DATA(pet_state)
652653   /* basic machine hardware */
653654   MDRV_CPU_ADD("main", M6502, 7833600)        /* 7.8336 MHz */
654655   MDRV_CPU_PROGRAM_MAP(pet_mem, 0)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team