Previous 15994 Revisions Next

r3598 Wednesday 26th November, 2008 at 20:44:43 UTC by Wilbert Pol
Compile fixes for acorn.a and p2000.a
[src/mess/drivers]a310.c acrnsys1.c bbc.c bbcbc.c osi.c p2000t.c z88.c
[src/mess/machine]atom.c bbc.c electron.c i8271.c ins8154.c mc6850.c mc6850.h p2000t.c
[src/mess/video]bbc.c electron.c

src/mess/video/electron.c
r3597r3598
246246
247247INTERRUPT_GEN( electron_scanline_interrupt )
248248{
249   switch (video_screen_get_vpos(machine->primary_screen))
249   switch (video_screen_get_vpos(device->machine->primary_screen))
250250   {
251251   case 43:
252      electron_interrupt_handler( machine, INT_SET, INT_RTC );
252      electron_interrupt_handler( device->machine, INT_SET, INT_RTC );
253253      break;
254254   case 199:
255      electron_interrupt_handler( machine, INT_SET, INT_DISPLAY_END );
255      electron_interrupt_handler( device->machine, INT_SET, INT_DISPLAY_END );
256256      break;
257257   case 255:
258258      ula.screen_addr = ula.screen_start - ula.screen_base;
src/mess/video/bbc.c
r3597r3598
280280   video_refresh=1;
281281
282282   // Make sure vpos is never <0 2008-10-11 PHS.
283   vpos=video_screen_get_vpos(machine->primary_screen);
283   vpos=video_screen_get_vpos(space->machine->primary_screen);
284284   if(vpos==0)
285     video_screen_update_partial(machine->primary_screen, vpos);
285     video_screen_update_partial(space->machine->primary_screen, vpos);
286286   else
287     video_screen_update_partial(machine->primary_screen, vpos -1 );
287     video_screen_update_partial(space->machine->primary_screen, vpos -1 );
288288
289289//   logerror("setting videoULA %s at %.4x size:%.4x\n",image_filename(image), addr, size);
290   logerror("setting videoULA %.4x to:%.4x   at :%d \n",data,offset,video_screen_get_vpos(machine->primary_screen) );
290   logerror("setting videoULA %.4x to:%.4x   at :%d \n",data,offset,video_screen_get_vpos(space->machine->primary_screen) );
291291
292292
293293   switch (offset&0x01)
src/mess/machine/ins8154.c
r3597r3598
4545static DEVICE_START( ins8154 )
4646{
4747   ins8154_t *ins8154 = device->token;
48   char unique_tag[30];
4948
5049   /* validate arguments */
5150   assert(device->machine != NULL);
r3597r3598
5655   ins8154->intf = device->static_config;
5756
5857   /* register for state saving */
59   state_save_combine_module_and_tag(unique_tag, "ins8154", device->tag);
60   state_save_register_item(unique_tag, 0, ins8154->in_a);
61   state_save_register_item(unique_tag, 0, ins8154->in_b);
62   state_save_register_item(unique_tag, 0, ins8154->out_a);
63   state_save_register_item(unique_tag, 0, ins8154->out_b);
64   state_save_register_item(unique_tag, 0, ins8154->mdr);
65   state_save_register_item(unique_tag, 0, ins8154->odra);
66   state_save_register_item(unique_tag, 0, ins8154->odrb);
58   state_save_register_item("ins8154", device->tag, 0, ins8154->in_a);
59   state_save_register_item("ins8154", device->tag, 0, ins8154->in_b);
60   state_save_register_item("ins8154", device->tag, 0, ins8154->out_a);
61   state_save_register_item("ins8154", device->tag, 0, ins8154->out_b);
62   state_save_register_item("ins8154", device->tag, 0, ins8154->mdr);
63   state_save_register_item("ins8154", device->tag, 0, ins8154->odra);
64   state_save_register_item("ins8154", device->tag, 0, ins8154->odrb);
6765   return DEVICE_START_OK;
6866}
6967
r3597r3598
9088   if (offset > 0x24)
9189   {
9290      logerror("INS8154 (%08x): Read from unknown offset %02x!\n",
93         safe_activecpu_get_pc(), offset);
91         safe_cpu_get_pc( device->machine->activecpu ), offset);
9492      return 0xff;
9593   }
9694   
r3597r3598
140138         i->intf->out_a_func(device, 0, (data & i->odra) | (i->odra ^ 0xff));
141139      else
142140         logerror("INS8154 (%08x): Write to port A but no write handler defined!\n",
143            safe_activecpu_get_pc());
141            safe_cpu_get_pc( device->machine->activecpu ) );
144142   }
145143}
146144
r3597r3598
158156         i->intf->out_b_func(device, 0, (data & i->odrb) | (i->odrb ^ 0xff));
159157      else
160158         logerror("INS8154 (%08x): Write to port B but no write handler defined!\n",
161            safe_activecpu_get_pc());
159            safe_cpu_get_pc( device->machine->activecpu ) );
162160   }
163161}
164162
r3597r3598
170168   if (offset > 0x24)
171169   {
172170      logerror("INS8154 (%04x): Write %02x to invalid offset %02x!\n",
173         safe_activecpu_get_pc(), data, offset);
171         safe_cpu_get_pc( device->machine->activecpu ), data, offset);
174172      return;
175173   }
176174   
r3597r3598
186184     
187185   case 0x22:
188186      LOG(("INS8154 (%04x): ODR for port A set to %02x\n",
189         safe_activecpu_get_pc(), data));
187         safe_cpu_get_pc( device->machine->activecpu ), data));
190188      i->odra = data;
191189      break;
192190     
193191   case 0x23:
194192      LOG(("INS8154 (%04x): ODR for port B set to %02x\n",
195         safe_activecpu_get_pc(), data));
193         safe_cpu_get_pc( device->machine->activecpu ), data));
196194      i->odrb = data;
197195      break;
198196     
199197   case 0x24:
200198      LOG(("INS8154 (%04x): MDR set to %02x\n",
201         safe_activecpu_get_pc(), data));
199         safe_cpu_get_pc( device->machine->activecpu ), data));
202200      i->mdr = data;
203201      break;
204202     
src/mess/machine/p2000t.c
r3597r3598
4747
4848   if (p2000t_ports.port_101f & P2000M_101F_KEYINT)
4949   {
50      return (input_port_read(machine, "KEY0") & input_port_read(machine, "KEY1") &
51      input_port_read(machine, "KEY2") & input_port_read(machine, "KEY3") &
52      input_port_read(machine, "KEY4") & input_port_read(machine, "KEY5") &
53      input_port_read(machine, "KEY6") & input_port_read(machine, "KEY7") &
54      input_port_read(machine, "KEY8") & input_port_read(machine, "KEY9"));
50      return (input_port_read(space->machine, "KEY0") & input_port_read(space->machine, "KEY1") &
51      input_port_read(space->machine, "KEY2") & input_port_read(space->machine, "KEY3") &
52      input_port_read(space->machine, "KEY4") & input_port_read(space->machine, "KEY5") &
53      input_port_read(space->machine, "KEY6") & input_port_read(space->machine, "KEY7") &
54      input_port_read(space->machine, "KEY8") & input_port_read(space->machine, "KEY9"));
5555   }
5656   else if (offset < 10)
5757   {
58      return (input_port_read(machine, keynames[offset]));
58      return (input_port_read(space->machine, keynames[offset]));
5959   }
6060   return (0xff);
6161}
src/mess/machine/electron.c
r3597r3598
105105   for( i = 0; i < 14; i++ )
106106   {
107107      if( !(offset & 1) )
108         data |= input_port_read(machine, keynames[i]) & 0x0f;
108         data |= input_port_read(space->machine, keynames[i]) & 0x0f;
109109
110110      offset = offset >> 1;
111111   }
r3597r3598
128128}
129129
130130READ8_HANDLER( electron_ula_r ) {
131   UINT8 data = ((UINT8 *)memory_region(machine, "user1"))[0x43E00 + offset];
131   UINT8 data = ((UINT8 *)memory_region(space->machine, "user1"))[0x43E00 + offset];
132132   switch ( offset & 0x0f ) {
133133   case 0x00:   /* Interrupt status */
134134      data = ula.interrupt_status;
r3597r3598
137137   case 0x01:   /* Unknown */
138138      break;
139139   case 0x04:   /* Casette data shift register */
140      electron_interrupt_handler( machine, INT_CLEAR, INT_RECEIVE_FULL );
140      electron_interrupt_handler( space->machine, INT_CLEAR, INT_RECEIVE_FULL );
141141      data = ula.tape_byte;
142142      break;
143143   }
r3597r3598
178178         ula.rompage = data & 0x0f;
179179         if ( ula.rompage == 8 || ula.rompage == 9 ) {
180180            ula.rompage = 8;
181            memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xbfff, 0, 0, electron_read_keyboard );
181            memory_install_read8_handler( space, 0x8000, 0xbfff, 0, 0, electron_read_keyboard );
182182         } else {
183            memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xbfff, 0, 0, SMH_BANK2 );
183            memory_install_read8_handler( space, 0x8000, 0xbfff, 0, 0, SMH_BANK2 );
184184         }
185         memory_set_bank(machine, 2, ula.rompage);
185         memory_set_bank(space->machine, 2, ula.rompage);
186186      }
187187      if ( data & 0x10 ) {
188         electron_interrupt_handler( machine, INT_CLEAR, INT_DISPLAY_END );
188         electron_interrupt_handler( space->machine, INT_CLEAR, INT_DISPLAY_END );
189189      }
190190      if ( data & 0x20 ) {
191         electron_interrupt_handler( machine, INT_CLEAR, INT_RTC );
191         electron_interrupt_handler( space->machine, INT_CLEAR, INT_RTC );
192192      }
193193      if ( data & 0x40 ) {
194         electron_interrupt_handler( machine, INT_CLEAR, INT_HIGH_TONE );
194         electron_interrupt_handler( space->machine, INT_CLEAR, INT_HIGH_TONE );
195195      }
196196      if ( data & 0x80 ) {
197197      }
r3597r3598
224224      ula.screen_mode = ( data >> 3 ) & 0x07;
225225      ula.screen_base = electron_screen_base[ ula.screen_mode ];
226226      ula.screen_size = 0x8000 - ula.screen_base;
227      ula.vram = memory_get_read_ptr( 0, ADDRESS_SPACE_PROGRAM, ula.screen_base );
227      ula.vram = memory_get_read_ptr( space, ula.screen_base );
228228      logerror( "ULA: screen mode set to %d\n", ula.screen_mode );
229229      ula.cassette_motor_mode = ( data >> 6 ) & 0x01;
230      cassette_change_state( cassette_device_image( machine ), ula.cassette_motor_mode ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MOTOR_DISABLED );
230      cassette_change_state( cassette_device_image( space->machine ), ula.cassette_motor_mode ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MOTOR_DISABLED );
231231      ula.capslock_mode = ( data >> 7 ) & 0x01;
232232      break;
233233   case 0x08: case 0x0A: case 0x0C: case 0x0E:
r3597r3598
286286   ula.screen_size = 0x8000 - 0x3000;
287287   ula.screen_addr = 0;
288288   ula.tape_running = 0;
289   ula.vram = memory_get_read_ptr( 0, ADDRESS_SPACE_PROGRAM, ula.screen_base );
289   ula.vram = memory_get_read_ptr( cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM ), ula.screen_base );
290290}
291291
292292MACHINE_START( electron )
src/mess/machine/i8271.c
r3597r3598
13701370/* to be completed! */
13711371READ8_HANDLER(i8271_dack_r)
13721372{
1373   return i8271_data_r(machine, offset);
1373   return i8271_data_r(space, offset);
13741374}
13751375
13761376/* to be completed! */
13771377WRITE8_HANDLER(i8271_dack_w)
13781378{
1379   i8271_data_w(machine, offset, data);
1379   i8271_data_w(space, offset, data);
13801380}
13811381
13821382 READ8_HANDLER(i8271_data_r)
src/mess/machine/mc6850.c
r3597r3598
3535{
3636}
3737
38int acia6850_read (running_machine *machine, int which, int offset)
38int acia6850_read (const address_space *space, int which, int offset)
3939{
4040   struct acia6850 *currptr = acia + which;
4141   int   val = 0;
r3597r3598
4444   {
4545      case ACIA_6850_CTRL:
4646         if ((*(*currptr).intf).in_status_func)
47                     val = (*(*currptr).intf).in_status_func(machine, 0);
47                     val = (*(*currptr).intf).in_status_func(space, 0);
4848         break;
4949      case ACIA_6850_DATA:
5050         if ((*(*currptr).intf).in_recv_func)
51                     val = (*(*currptr).intf).in_recv_func(machine, 0);
51                     val = (*(*currptr).intf).in_recv_func(space, 0);
5252         break;
5353   }
5454   return (val);
5555}
5656
57void acia6850_write (running_machine *machine, int which, int offset, int data)
57void acia6850_write (const address_space *space, int which, int offset, int data)
5858{
5959   struct acia6850 *currptr = acia + which;
6060
r3597r3598
6262   {
6363      case ACIA_6850_CTRL:
6464         if ((*(*currptr).intf).out_status_func)
65                     (*(*currptr).intf).out_status_func(machine, 0, data);
65                     (*(*currptr).intf).out_status_func(space, 0, data);
6666         break;
6767      case ACIA_6850_DATA:
6868         if ((*(*currptr).intf).out_tran_func)
69                     (*(*currptr).intf).out_tran_func(machine, 0, data);
69                     (*(*currptr).intf).out_tran_func(space, 0, data);
7070         break;
7171   }
7272}
7373
74 READ8_HANDLER( acia6850_0_r ) { return acia6850_read (machine, 0, offset); }
75 READ8_HANDLER( acia6850_1_r ) { return acia6850_read (machine, 1, offset); }
76 READ8_HANDLER( acia6850_2_r ) { return acia6850_read (machine, 2, offset); }
77 READ8_HANDLER( acia6850_3_r ) { return acia6850_read (machine, 3, offset); }
74 READ8_HANDLER( acia6850_0_r ) { return acia6850_read (space, 0, offset); }
75 READ8_HANDLER( acia6850_1_r ) { return acia6850_read (space, 1, offset); }
76 READ8_HANDLER( acia6850_2_r ) { return acia6850_read (space, 2, offset); }
77 READ8_HANDLER( acia6850_3_r ) { return acia6850_read (space, 3, offset); }
7878
79WRITE8_HANDLER( acia6850_0_w ) { acia6850_write (machine, 0, offset, data); }
80WRITE8_HANDLER( acia6850_1_w ) { acia6850_write (machine, 1, offset, data); }
81WRITE8_HANDLER( acia6850_2_w ) { acia6850_write (machine, 2, offset, data); }
82WRITE8_HANDLER( acia6850_3_w ) { acia6850_write (machine, 3, offset, data); }
79WRITE8_HANDLER( acia6850_0_w ) { acia6850_write (space, 0, offset, data); }
80WRITE8_HANDLER( acia6850_1_w ) { acia6850_write (space, 1, offset, data); }
81WRITE8_HANDLER( acia6850_2_w ) { acia6850_write (space, 2, offset, data); }
82WRITE8_HANDLER( acia6850_3_w ) { acia6850_write (space, 3, offset, data); }
8383
8484
8585
src/mess/machine/mc6850.h
r3597r3598
2626
2727struct acia6850_interface
2828{
29   read8_machine_func in_status_func;
30   read8_machine_func in_recv_func;
31   write8_machine_func out_status_func;
32   write8_machine_func out_tran_func;
29   read8_space_func in_status_func;
30   read8_space_func in_recv_func;
31   write8_space_func out_status_func;
32   write8_space_func out_tran_func;
3333};
3434
3535void acia6850_unconfig(void);
3636void acia6850_config_old( int which, const struct acia6850_interface *intf);
3737void acia6850_reset(void);
38int acia6850_read(running_machine *machine, int which, int offset);
39void acia6850_write(running_machine *machine, int which, int offset, int data);
38int acia6850_read(const address_space *space, int which, int offset);
39void acia6850_write(const address_space *space, int which, int offset, int data);
4040
4141 READ8_HANDLER( acia6850_0_r );
4242 READ8_HANDLER( acia6850_1_r );
src/mess/machine/atom.c
r3597r3598
4444{
4545   if (state)
4646   {
47      cpunum_set_input_line(machine, 0, 0, HOLD_LINE);
47      cpu_set_input_line(machine->cpu[0], 0, HOLD_LINE);
4848   }
4949   else
5050   {
51      cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
51      cpu_set_input_line(machine->cpu[0], 0, CLEAR_LINE);
5252   }
5353}
5454
r3597r3598
6969
7070   data = atom_printer_data;
7171
72   if (!printer_is_ready(printer_image(machine)))
72   if (!printer_is_ready(printer_image(space->machine)))
7373   {
7474      /* offline */
7575      data |=0x080;
r3597r3598
9999      if (data & 0x01)
100100      {
101101         /* output data to printer */
102         printer_output(printer_image(machine), atom_printer_data);
102         printer_output(printer_image(space->machine), atom_printer_data);
103103      }
104104   }
105105
r3597r3598
151151      {
152152         /* I'll pulse it because if I used hold-line I'm not sure
153153         it would clear - to be checked */
154         cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, PULSE_LINE);
154         cpu_set_input_line(Machine->cpu[0], INPUT_LINE_NMI, PULSE_LINE);
155155      }
156156   }
157157
r3597r3598
220220}
221221
222222
223static OPBASE_HANDLER(atom_opbase_handler)
223static DIRECT_UPDATE_HANDLER(atom_opbase_handler)
224224{
225225   /* clear op base override */
226   memory_set_opbase_handler(0,0);
226   memory_set_direct_update_handler(space, NULL);
227227
228228   /* this is temporary */
229229   /* Kees van Oss mentions that address 8-b are used for the random number
230230   generator. I don't know if this is hardware, or random data because the
231231   ram chips are not cleared at start-up. So at this time, these numbers
232232   are poked into the memory to simulate it. When I have more details I will fix it */
233   memory_region(machine, "main")[0x08] = mame_rand(machine) & 0x0ff;
234   memory_region(machine, "main")[0x09] = mame_rand(machine) & 0x0ff;
235   memory_region(machine, "main")[0x0a] = mame_rand(machine) & 0x0ff;
236   memory_region(machine, "main")[0x0b] = mame_rand(machine) & 0x0ff;
233   memory_region(space->machine, "main")[0x08] = mame_rand(space->machine) & 0x0ff;
234   memory_region(space->machine, "main")[0x09] = mame_rand(space->machine) & 0x0ff;
235   memory_region(space->machine, "main")[0x0a] = mame_rand(space->machine) & 0x0ff;
236   memory_region(space->machine, "main")[0x0b] = mame_rand(space->machine) & 0x0ff;
237237
238   return activecpu_get_pc() & 0x0ffff;
238   return cpu_get_pc( space->cpu ) & 0x0ffff;
239239}
240240
241241MACHINE_RESET( atom )
r3597r3598
253253   timer_state = 0;
254254   timer_pulse(ATTOTIME_IN_HZ(2400*2), NULL, 0, atom_timer_callback);
255255
256   memory_set_opbase_handler(0,atom_opbase_handler);
256   memory_set_direct_update_handler(cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM ),atom_opbase_handler);
257257}
258258
259259struct atm
r3597r3598
316316   /* copy data into memory */
317317   for (i=size-1; i>=0; i--)
318318   {
319      program_write_byte(addr, data[0]);
319      memory_write_byte( cpu_get_address_space( Machine->cpu[0], ADDRESS_SPACE_PROGRAM ), addr, data[0]);
320320      addr++;
321321      data++;
322322   }
323323
324324
325325   /* set new pc address */
326   activecpu_set_reg(REG_PC, exec);
326   cpu_set_reg( Machine->cpu[0], REG_PC, exec);
327327
328328   /* free the data */
329329   free(quickload_data);
r3597r3598
428428      case 2:
429429      case 3:
430430         /* 8271 registers */
431         return i8271_r(machine, offset);
431         return i8271_r(space, offset);
432432      case 4:
433         return i8271_data_r(machine, offset);
433         return i8271_data_r(space, offset);
434434      default:
435435         break;
436436   }
r3597r3598
447447      case 2:
448448      case 3:
449449         /* 8271 registers */
450         i8271_w(machine, offset, data);
450         i8271_w(space, offset, data);
451451         return;
452452      case 4:
453         i8271_data_w(machine, offset, data);
453         i8271_data_w(space, offset, data);
454454         return;
455455      default:
456456         break;
r3597r3598
469469   /* get address of eprom data */
470470   eprom_data = memory_region(machine, "main") + 0x010000 + (selected_eprom<<12);
471471   /* set bank address */
472   memory_set_bankptr(1, eprom_data);
472   memory_set_bankptr(machine, 1, eprom_data);
473473}
474474
475475void atom_eprom_box_init(running_machine *machine)
r3597r3598
486486{
487487   selected_eprom = data & 0x0f;
488488
489   atom_eprom_box_refresh(machine);
489   atom_eprom_box_refresh(space->machine);
490490}
491491
492492/* read from eprom box register, can this be done in the real hardware */
src/mess/machine/bbc.c
r3597r3598
7272/* for the model A just address the 4 on board ROM sockets */
7373WRITE8_HANDLER ( page_selecta_w )
7474{
75   memory_set_bankptr(4,memory_region(machine, "user1")+((data&0x03)<<14));
75   memory_set_bankptr(space->machine,4,memory_region(space->machine, "user1")+((data&0x03)<<14));
7676}
7777
7878
7979WRITE8_HANDLER ( memorya1_w )
8080{
81   memory_region(machine, "main")[offset]=data;
81   memory_region(space->machine, "main")[offset]=data;
8282
8383   // this array is set so that the video emulator know which addresses to redraw
8484   vidmem[offset]=1;
r3597r3598
9595   bbc_rombank=data&0x0f;
9696   if (bbc_rombank!=1)
9797   {
98      memory_set_bankptr(4,memory_region(machine, "user1")+(bbc_rombank<<14));
98      memory_set_bankptr(space->machine, 4,memory_region(space->machine, "user1")+(bbc_rombank<<14));
9999   } else {
100      memory_set_bankptr(4,memory_region(machine, "user2")+((bbc_DFSType)<<14));
100      memory_set_bankptr(space->machine, 4,memory_region(space->machine, "user2")+((bbc_DFSType)<<14));
101101   }
102102}
103103
r3597r3598
105105WRITE8_HANDLER ( memoryb3_w )
106106{
107107   if (bbc_RAMSize) {
108      memory_region(machine, "main")[offset+0x4000]=data;
108      memory_region(space->machine, "main")[offset+0x4000]=data;
109109      // this array is set so that the video emulator know which addresses to redraw
110110      vidmem[offset+0x4000]=1;
111111   } else {
112      memory_region(machine, "main")[offset]=data;
112      memory_region(space->machine, "main")[offset]=data;
113113      vidmem[offset]=1;
114114   }
115115
r3597r3598
130130   if (bbc_rombank==1)
131131   {
132132      // special DFS case for Acorn DFS E00 Hack that can write to the DFS RAM Bank;
133      if (bbc_DFSType==3) memory_region(machine, "user2")[((bbc_DFSType)<<14)+offset]=data;
133      if (bbc_DFSType==3) memory_region(space->machine, "user2")[((bbc_DFSType)<<14)+offset]=data;
134134   } else
135135   {
136136      switch (bbc_SWRAMtype) {
137         case 1:   if (bbc_SWRAMtype1[bbc_userport]) memory_region(machine, "user1")[(bbc_userport<<14)+offset]=data;
138         case 2:   if (bbc_SWRAMtype2[bbc_rombank])  memory_region(machine, "user1")[(bbc_rombank<<14)+offset]=data;
139         case 3:   if (bbc_SWRAMtype3[bbc_rombank])  memory_region(machine, "user1")[(bbc_rombank<<14)+offset]=data;
137         case 1:   if (bbc_SWRAMtype1[bbc_userport]) memory_region(space->machine, "user1")[(bbc_userport<<14)+offset]=data;
138         case 2:   if (bbc_SWRAMtype2[bbc_rombank])  memory_region(space->machine, "user1")[(bbc_rombank<<14)+offset]=data;
139         case 3:   if (bbc_SWRAMtype3[bbc_rombank])  memory_region(space->machine, "user1")[(bbc_rombank<<14)+offset]=data;
140140      }
141141   }
142142}
r3597r3598
157157static int vdudriverset(void)
158158{
159159   int PC;
160   PC=activecpu_get_pc(); // this needs to be set to the 6502 program counter
160   PC=cpu_get_pc( Machine->activecpu ); // this needs to be set to the 6502 program counter
161161   return (((PC>=0xc000) && (PC<=0xdfff)) || ((pagedRAM) && ((PC>=0xa000) && (PC<=0xafff))));
162162}
163163
r3597r3598
174174      if (pagedRAM)
175175      {
176176         /* if paged ram then set 8000 to afff to read from the ram 8000 to afff */
177         memory_set_bankptr(4,memory_region(machine, "main")+0x8000);
177         memory_set_bankptr(space->machine, 4,memory_region(space->machine, "main")+0x8000);
178178      } else {
179179         /* if paged rom then set the rom to be read from 8000 to afff */
180         memory_set_bankptr(4,memory_region(machine, "user1")+(bbc_rombank<<14));
180         memory_set_bankptr(space->machine, 4,memory_region(space->machine, "user1")+(bbc_rombank<<14));
181181      };
182182
183183      /* set the rom to be read from b000 to bfff */
184      memory_set_bank(6, bbc_rombank);
184      memory_set_bank(space->machine, 6, bbc_rombank);
185185   }
186186   else
187187   {
188188      //the video display should now use this flag to display the shadow ram memory
189189      vdusel=(data>>7)&0x01;
190      bbcbp_setvideoshadow(machine, vdusel);
190      bbcbp_setvideoshadow(space->machine, vdusel);
191191      //need to make the video display do a full screen refresh for the new memory area
192      memory_set_bankptr(2, memory_region(machine, "main")+0x3000);
192      memory_set_bankptr(space->machine, 2, memory_region(space->machine, "main")+0x3000);
193193   }
194194}
195195
r3597r3598
200200
201201WRITE8_HANDLER ( memorybp1_w )
202202{
203   memory_region(machine, "main")[offset]=data;
203   memory_region(space->machine, "main")[offset]=data;
204204
205205   // this array is set so that the video emulator know which addresses to redraw
206206   vidmem[offset]=1;
r3597r3598
220220*/
221221
222222
223static OPBASE_HANDLER( bbcbp_opbase_handler )
223static DIRECT_UPDATE_HANDLER( bbcbp_direct_handler )
224224{
225   UINT8 *ram = memory_region(machine, "main");
225   UINT8 *ram = memory_region(space->machine, "main");
226226   if (vdusel==0)
227227   {
228228      // not in shadow ram mode so just read normal ram
229      memory_set_bankptr(2, ram+0x3000);
229      memory_set_bankptr(space->machine, 2, ram+0x3000);
230230   } else {
231231      if (vdudriverset())
232232      {
233233         // if VDUDriver set then read from shadow ram
234         memory_set_bankptr(2, ram+0xb000);
234         memory_set_bankptr(space->machine, 2, ram+0xb000);
235235      } else {
236236         // else read from normal ram
237         memory_set_bankptr(2, ram+0x3000);
237         memory_set_bankptr(space->machine, 2, ram+0x3000);
238238      }
239239   }
240240   return address;
r3597r3598
243243
244244WRITE8_HANDLER ( memorybp2_w )
245245{
246   UINT8 *ram = memory_region(machine, "main");
246   UINT8 *ram = memory_region(space->machine, "main");
247247   if (vdusel==0)
248248   {
249249      // not in shadow ram mode so just write to normal ram
r3597r3598
270270{
271271   if (pagedRAM)
272272   {
273      memory_region(machine, "main")[offset+0x8000]=data;
273      memory_region(space->machine, "main")[offset+0x8000]=data;
274274   }
275275}
276276
r3597r3598
290290{
291291   if (pagedRAM)
292292   {
293      memory_region(machine, "main")[offset+0x8000]=data;
293      memory_region(space->machine, "main")[offset+0x8000]=data;
294294   }
295295   else
296296   {
297297      if (bbc_b_plus_sideways_ram_banks[bbc_rombank])
298298      {
299         memory_region(machine, "user1")[offset+(bbc_rombank<<14)]=data;
299         memory_region(space->machine, "user1")[offset+(bbc_rombank<<14)]=data;
300300      }
301301   }
302302}
r3597r3598
305305{
306306   if (bbc_b_plus_sideways_ram_banks[bbc_rombank])
307307   {
308      memory_region(machine, "user1")[offset+(bbc_rombank<<14)+0x3000]=data;
308      memory_region(space->machine, "user1")[offset+(bbc_rombank<<14)+0x3000]=data;
309309   }
310310}
311311
r3597r3598
398398
399399     if (tempIRR!=ACCCON_IRR)
400400     {
401      bbc_setirq(machine);
401      bbc_setirq(space->machine);
402402   }
403403
404404   if (ACCCON_Y)
405405   {
406      memory_set_bankptr(7,memory_region(machine, "main")+0x9000);
406      memory_set_bankptr(space->machine, 7,memory_region(space->machine, "main")+0x9000);
407407   } else {
408      memory_set_bankptr(7,memory_region(machine, "user1")+0x40000);
408      memory_set_bankptr(space->machine, 7,memory_region(space->machine, "user1")+0x40000);
409409   }
410410
411   bbcbp_setvideoshadow(machine, ACCCON_D);
411   bbcbp_setvideoshadow(space->machine, ACCCON_D);
412412
413413
414414   if (ACCCON_X)
415415   {
416      memory_set_bankptr( 2, memory_region( machine, "main" ) + 0xb000 );
416      memory_set_bankptr( space->machine, 2, memory_region( space->machine, "main" ) + 0xb000 );
417417   } else {
418      memory_set_bankptr( 2, memory_region( machine, "main" ) + 0x3000 );
418      memory_set_bankptr( space->machine, 2, memory_region( space->machine, "main" ) + 0x3000 );
419419   }
420420
421421   /* ACCCON_TST controls paging of rom reads in the 0xFC00-0xFEFF reigon */
r3597r3598
423423   /* if 1 the the ROM is paged in for reads but writes still go to I/O   */
424424   if (ACCCON_TST)
425425   {
426      memory_set_bankptr( 8, memory_region(machine, "user1")+0x43c00);
427      memory_install_read_handler(machine, 0, ADDRESS_SPACE_PROGRAM,0xFC00,0xFEFF,0,0,8);
426      memory_set_bankptr( space->machine, 8, memory_region(space->machine, "user1")+0x43c00);
427      memory_install_read_handler(space, 0xFC00,0xFEFF,0,0,8);
428428   }
429429   else
430430   {
431      memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM,0xFC00,0xFEFF,0,0,bbcm_r);
431      memory_install_read8_handler(space, 0xFC00,0xFEFF,0,0,bbcm_r);
432432   }
433433
434434}
r3597r3598
437437static int bbcm_vdudriverset(void)
438438{
439439   int PC;
440   PC=activecpu_get_pc();
440   PC=cpu_get_pc( Machine->activecpu );
441441   return ((PC>=0xc000) && (PC<=0xdfff));
442442}
443443
r3597r3598
449449
450450   if (pagedRAM)
451451   {
452      memory_set_bankptr(4,memory_region(machine, "main")+0x8000);
453      memory_set_bank(5, bbc_rombank);
452      memory_set_bankptr(space->machine, 4,memory_region(space->machine, "main")+0x8000);
453      memory_set_bank(space->machine, 5, bbc_rombank);
454454   } else {
455      memory_set_bankptr(4,memory_region(machine, "user1")+((bbc_rombank)<<14));
456      memory_set_bank(5, bbc_rombank);
455      memory_set_bankptr(space->machine, 4,memory_region(space->machine, "user1")+((bbc_rombank)<<14));
456      memory_set_bank(space->machine, 5, bbc_rombank);
457457   }
458458}
459459
r3597r3598
461461
462462WRITE8_HANDLER ( memorybm1_w )
463463{
464   memory_region(machine, "main")[offset]=data;
464   memory_region(space->machine, "main")[offset]=data;
465465   vidmem[offset]=1;
466466}
467467
468468
469static OPBASE_HANDLER( bbcm_opbase_handler )
469static DIRECT_UPDATE_HANDLER( bbcm_direct_handler )
470470{
471471   if (ACCCON_X)
472472   {
473      memory_set_bankptr( 2, memory_region( machine, "main" ) + 0xb000 );
473      memory_set_bankptr( space->machine, 2, memory_region( space->machine, "main" ) + 0xb000 );
474474   } else {
475475      if (ACCCON_E && bbcm_vdudriverset())
476476      {
477         memory_set_bankptr( 2, memory_region( machine, "main" ) + 0xb000 );
477         memory_set_bankptr( space->machine, 2, memory_region( space->machine, "main" ) + 0xb000 );
478478      } else {
479         memory_set_bankptr( 2, memory_region( machine, "main" ) + 0x3000 );
479         memory_set_bankptr( space->machine, 2, memory_region( space->machine, "main" ) + 0x3000 );
480480      }
481481   }
482482
r3597r3598
487487
488488WRITE8_HANDLER ( memorybm2_w )
489489{
490   UINT8 *ram = memory_region(machine, "main");
490   UINT8 *ram = memory_region(space->machine, "main");
491491   if (ACCCON_X)
492492   {
493493      ram[offset+0xb000]=data;
r3597r3598
514514{
515515   if (pagedRAM)
516516   {
517      memory_region(machine, "main")[offset+0x8000]=data;
517      memory_region(space->machine, "main")[offset+0x8000]=data;
518518   }
519519   else
520520   {
521521      if (bbc_master_sideways_ram_banks[bbc_rombank])
522522      {
523         memory_region(machine, "user1")[offset+(bbc_rombank<<14)]=data;
523         memory_region(space->machine, "user1")[offset+(bbc_rombank<<14)]=data;
524524      }
525525   }
526526}
r3597r3598
530530{
531531   if (bbc_master_sideways_ram_banks[bbc_rombank])
532532   {
533      memory_region(machine, "user1")[offset+(bbc_rombank<<14)+0x1000]=data;
533      memory_region(space->machine, "user1")[offset+(bbc_rombank<<14)+0x1000]=data;
534534   }
535535}
536536
r3597r3598
539539{
540540   if (ACCCON_Y)
541541   {
542      memory_region(machine, "main")[offset+0x9000]=data;
542      memory_region(space->machine, "main")[offset+0x9000]=data;
543543   }
544544}
545545
r3597r3598
574574   /* Now handled in bbcm_ACCCON_write PHS - 2008-10-11 */
575575//   if ( ACCCON_TST )
576576//   {
577//      return memory_region(machine, "user1")[offset+0x43c00];
577//      return memory_region(space->machine, "user1")[offset+0x43c00];
578578//   };
579579
580580   if ((offset>=0x000) && (offset<=0x0ff)) /* FRED */
r3597r3598
591591   if ((offset>=0x200) && (offset<=0x2ff)) /* SHEILA */
592592   {
593593      myo=offset-0x200;
594      if ((myo>=0x00) && (myo<=0x07)) return BBC_6845_r(machine, myo-0x00);      /* Video Controller */
595      if ((myo>=0x08) && (myo<=0x0f)) return BBC_6850_r(machine, myo-0x08);      /* Serial Controller */
594      if ((myo>=0x00) && (myo<=0x07)) return BBC_6845_r(space, myo-0x00);      /* Video Controller */
595      if ((myo>=0x08) && (myo<=0x0f)) return BBC_6850_r(space, myo-0x08);      /* Serial Controller */
596596      if ((myo>=0x10) && (myo<=0x17)) return 0xfe;                  /* Serial System Chip */
597      if ((myo>=0x18) && (myo<=0x1f)) return uPD7002_r(machine, myo-0x18);         /* A to D converter */
597      if ((myo>=0x18) && (myo<=0x1f)) return uPD7002_r(space, myo-0x18);         /* A to D converter */
598598      if ((myo>=0x20) && (myo<=0x23)) return 0xfe;                  /* VideoULA */
599      if ((myo>=0x24) && (myo<=0x27)) return bbcm_wd1770l_read(machine, myo-0x24); /* 1770 */
600      if ((myo>=0x28) && (myo<=0x2f)) return bbcm_wd1770_read(machine, myo-0x28);  /* disc control latch */
599      if ((myo>=0x24) && (myo<=0x27)) return bbcm_wd1770l_read(space, myo-0x24); /* 1770 */
600      if ((myo>=0x28) && (myo<=0x2f)) return bbcm_wd1770_read(space, myo-0x28);  /* disc control latch */
601601      if ((myo>=0x30) && (myo<=0x33)) return 0xfe;                  /* page select */
602      if ((myo>=0x34) && (myo<=0x37)) return bbcm_ACCCON_read(machine, myo-0x34);   /* ACCCON */
602      if ((myo>=0x34) && (myo<=0x37)) return bbcm_ACCCON_read(space, myo-0x34);   /* ACCCON */
603603      if ((myo>=0x38) && (myo<=0x3f)) return 0xfe;                  /* NC ?? */
604      if ((myo>=0x40) && (myo<=0x5f)) return via_0_r(machine, myo-0x40);
605      if ((myo>=0x60) && (myo<=0x7f)) return via_1_r(machine, myo-0x60);
604      if ((myo>=0x40) && (myo<=0x5f)) return via_0_r(space, myo-0x40);
605      if ((myo>=0x60) && (myo<=0x7f)) return via_1_r(space, myo-0x60);
606606      if ((myo>=0x80) && (myo<=0x9f)) return 0xfe;
607607      if ((myo>=0xa0) && (myo<=0xbf)) return 0xfe;
608608      if ((myo>=0xc0) && (myo<=0xdf)) return 0xfe;
r3597r3598
619619   if ((offset>=0x200) && (offset<=0x2ff)) /* SHEILA */
620620   {
621621      myo=offset-0x200;
622      if ((myo>=0x00) && (myo<=0x07)) BBC_6845_w(machine, myo-0x00,data);         /* Video Controller */
623      if ((myo>=0x08) && (myo<=0x0f)) BBC_6850_w(machine, myo-0x08,data);         /* Serial Controller */
624      if ((myo>=0x10) && (myo<=0x17)) BBC_SerialULA_w(machine, myo-0x10,data);      /* Serial System Chip */
625      if ((myo>=0x18) && (myo<=0x1f)) uPD7002_w(machine, myo-0x18,data);         /* A to D converter */
626      if ((myo>=0x20) && (myo<=0x23)) videoULA_w(machine, myo-0x20,data);         /* VideoULA */
627      if ((myo>=0x24) && (myo<=0x27)) bbcm_wd1770l_write(machine, myo-0x24,data);    /* 1770 */
628      if ((myo>=0x28) && (myo<=0x2f)) bbcm_wd1770_write(machine, myo-0x28,data);     /* disc control latch */
629      if ((myo>=0x30) && (myo<=0x33)) page_selectbm_w(machine, myo-0x30,data);      /* page select */
630      if ((myo>=0x34) && (myo<=0x37)) bbcm_ACCCON_write(machine, myo-0x34,data);   /* ACCCON */
622      if ((myo>=0x00) && (myo<=0x07)) BBC_6845_w(space, myo-0x00,data);         /* Video Controller */
623      if ((myo>=0x08) && (myo<=0x0f)) BBC_6850_w(space, myo-0x08,data);         /* Serial Controller */
624      if ((myo>=0x10) && (myo<=0x17)) BBC_SerialULA_w(space, myo-0x10,data);      /* Serial System Chip */
625      if ((myo>=0x18) && (myo<=0x1f)) uPD7002_w(space, myo-0x18,data);         /* A to D converter */
626      if ((myo>=0x20) && (myo<=0x23)) videoULA_w(space, myo-0x20,data);         /* VideoULA */
627      if ((myo>=0x24) && (myo<=0x27)) bbcm_wd1770l_write(space, myo-0x24,data);    /* 1770 */
628      if ((myo>=0x28) && (myo<=0x2f)) bbcm_wd1770_write(space, myo-0x28,data);     /* disc control latch */
629      if ((myo>=0x30) && (myo<=0x33)) page_selectbm_w(space, myo-0x30,data);      /* page select */
630      if ((myo>=0x34) && (myo<=0x37)) bbcm_ACCCON_write(space, myo-0x34,data);   /* ACCCON */
631631      //if ((myo>=0x38) && (myo<=0x3f))                            /* NC ?? */
632      if ((myo>=0x40) && (myo<=0x5f)) via_0_w(machine, myo-0x40,data);
633      if ((myo>=0x60) && (myo<=0x7f)) via_1_w(machine, myo-0x60,data);
632      if ((myo>=0x40) && (myo<=0x5f)) via_0_w(space, myo-0x40,data);
633      if ((myo>=0x60) && (myo<=0x7f)) via_1_w(space, myo-0x60,data);
634634      //if ((myo>=0x80) && (myo<=0x9f))
635635      //if ((myo>=0xa0) && (myo<=0xbf))
636636      //if ((myo>=0xc0) && (myo<=0xdf))
r3597r3598
782782           /* KBD IC4 8 input NAND gate */
783783           /* set the value of via_system ca2, by checking for any keys
784784              being pressed on the selected column */
785         if ((input_port_read(machine, colnames[column]) | 0x01) != 0xff)
785         if ((input_port_read(device->machine, colnames[column]) | 0x01) != 0xff)
786786         {
787            via_0_ca2_w(machine, 0, 1);
787            via_0_ca2_w(cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0, 1);
788788         }
789789         else
790790         {
791            via_0_ca2_w(machine, 0, 0);
791            via_0_ca2_w(cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0, 0);
792792         }
793793
794794      }
795795      else
796796      {
797         via_0_ca2_w(machine, 0, 0);
797         via_0_ca2_w(cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0, 0);
798798      }
799799   }
800800}
r3597r3598
819819         /* KBD IC4 8 input NAND gate */
820820         /* set the value of via_system ca2, by checking for any keys
821821             being pressed on the selected column */
822         if ((input_port_read(machine, colnames[column]) | 0x01) != 0xff)
822         if ((input_port_read(device->machine, colnames[column]) | 0x01) != 0xff)
823823         {
824            via_0_ca2_w(machine, 0, 1);
824            via_0_ca2_w(cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0, 1);
825825         } else {
826            via_0_ca2_w(machine, 0, 0);
826            via_0_ca2_w(cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0, 0);
827827         }
828828
829829      } else {
830         via_0_ca2_w(machine, 0, 0);
830         via_0_ca2_w(cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0, 0);
831831      }
832832   }
833833}
834834
835835
836836
837static int bbc_keyboard(running_machine *machine, int data)
837static int bbc_keyboard(const address_space *space, int data)
838838{
839839   int bit;
840840   int row;
r3597r3598
849849
850850   if (column < 10)
851851   {
852      res = input_port_read(machine, colnames[column]);
852      res = input_port_read(space->machine, colnames[column]);
853853   }
854854   else
855855   {
r3597r3598
864864
865865   if ((res | 1) != 0xff)
866866   {
867      via_0_ca2_w(machine, 0, 1);
867      via_0_ca2_w(space, 0, 1);
868868   }
869869   else
870870   {
871      via_0_ca2_w(machine, 0, 0);
871      via_0_ca2_w(space, 0, 0);
872872   }
873873
874874   return (data & 0x7f) | (bit<<7);
r3597r3598
890890
891891
892892/* This the BBC Masters Real Time Clock and NVRam IC */
893static void MC146818_set(running_machine *machine)
893static void MC146818_set(const address_space *space)
894894{
895895   logerror ("146181 WR=%d DS=%d AS=%d CE=%d \n",MC146818_WR,MC146818_DS,MC146818_AS,MC146818_CE);
896896
r3597r3598
902902      {
903903         if (MC146818_WR)
904904         {
905            via_system_porta=mc146818_port_r(machine, 1);
905            via_system_porta=mc146818_port_r(space, 1);
906906            //logerror("read 146818 data %d \n",via_system_porta);
907907         } else {
908            mc146818_port_w(machine, 1,via_system_porta);
908            mc146818_port_w(space, 1,via_system_porta);
909909            //logerror("write 146818 data %d \n",via_system_porta);
910910         }
911911      }
r3597r3598
913913      // if address select is set then set the address in the 146818
914914      if (MC146818_AS)
915915      {
916         mc146818_port_w(machine, 0,via_system_porta);
916         mc146818_port_w(space, 0,via_system_porta);
917917         //logerror("write 146818 address %d \n",via_system_porta);
918918      }
919919   }
r3597r3598
929929   if (b0_sound==0)
930930   {
931931       //logerror("Doing an unsafe write to the sound chip %d \n",data);
932      sn76496_0_w(machine, 0,via_system_porta);
932      sn76496_0_w(space, 0,via_system_porta);
933933   }
934934   if (b3_keyboard==0)
935935   {
936936       //logerror("Doing an unsafe write to the keyboard %d \n",data);
937      via_system_porta=bbc_keyboard(machine, via_system_porta);
937      via_system_porta=bbc_keyboard(space, via_system_porta);
938938   }
939   if (bbc_Master) MC146818_set(machine);
939   if (bbc_Master) MC146818_set(space);
940940}
941941
942942
r3597r3598
963963            {
964964               /* BBC MASTER has NV RAM Here */
965965               MC146818_WR=1;
966               MC146818_set(machine);
966               MC146818_set(space);
967967            }
968968         } else {
969969            if (b1_speech_read==0) {
r3597r3598
979979            {
980980               /* BBC MASTER has NV RAM Here */
981981               MC146818_DS=1;
982               MC146818_set(machine);
982               MC146818_set(space);
983983            }
984984         } else {
985985            if (b2_speech_write==0) {
r3597r3598
10241024      case 0:
10251025         if (b0_sound==1) {
10261026            b0_sound=0;
1027            sn76496_0_w(machine, 0,via_system_porta);
1027            sn76496_0_w(space, 0,via_system_porta);
10281028         }
10291029         break;
10301030      case 1:
r3597r3598
10341034            {
10351035               /* BBC MASTER has NV RAM Here */
10361036               MC146818_WR=0;
1037               MC146818_set(machine);
1037               MC146818_set(space);
10381038            }
10391039         } else {
10401040            if (b1_speech_read==1) {
r3597r3598
10501050            {
10511051               /* BBC MASTER has NV RAM Here */
10521052               MC146818_DS=0;
1053               MC146818_set(machine);
1053               MC146818_set(space);
10541054            }
10551055         } else {
10561056            if (b2_speech_write==1) {
r3597r3598
10631063         if (b3_keyboard==1) {
10641064            b3_keyboard=0;
10651065            /* *** call keyboard enabled *** */
1066            via_system_porta=bbc_keyboard(machine, via_system_porta);
1066            via_system_porta=bbc_keyboard(space, via_system_porta);
10671067         }
10681068         break;
10691069      case 4:
r3597r3598
11011101      if (MC146818_AS != ((data>>7)&1))
11021102      {
11031103         MC146818_AS=(data>>7)&1;
1104         MC146818_set(machine);
1104         MC146818_set(space);
11051105      }
11061106
11071107      //if CE changes
11081108      if (MC146818_CE != ((data>>6)&1))
11091109      {
11101110         MC146818_CE=(data>>6)&1;
1111         MC146818_set(machine);
1111         MC146818_set(space);
11121112      }
11131113   }
11141114}
r3597r3598
11451145
11461146   //logerror("SYSTEM read portb %d\n",0xf | input_port(machine, "IN0")|(TMSint<<6)|(TMSrdy<<7));
11471147
1148   return (0xf | input_port_read(machine, "IN0")|(TMSint<<6)|(TMSrdy<<7));
1148   return (0xf | input_port_read(space->machine, "IN0")|(TMSint<<6)|(TMSrdy<<7));
11491149}
11501150
11511151
r3597r3598
11591159/* joystick EOC */
11601160static  READ8_HANDLER( bbcb_via_system_read_cb1 )
11611161{
1162  return uPD7002_EOC_r(machine, 0);
1162  return uPD7002_EOC_r(space, 0);
11631163}
11641164
11651165
r3597r3598
12801280   /* this is a very bad way of returning an acknowledge
12811281   by just linking the strobe output into the acknowledge input */
12821282   bbc_printer_ca1=data;
1283   via_1_ca1_w(machine, 0,data);
1283   via_1_ca1_w(space, 0,data);
12841284}
12851285
12861286static void bbc_via_user_irq(running_machine *machine, int level)
r3597r3598
13351335
13361336static void BBC_uPD7002_EOC(int data)
13371337{
1338   via_0_cb1_w(Machine, 0,data);
1338   via_0_cb1_w(cpu_get_address_space(Machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0,data);
13391339}
13401340
13411341static const struct uPD7002_interface BBC_uPD7002 =
r3597r3598
14991499
15001500WRITE8_HANDLER ( BBC_SerialULA_w )
15011501{
1502   BBC_Cassette_motor(machine, (data & 0x80) >> 7);
1502   BBC_Cassette_motor(space->machine, (data & 0x80) >> 7);
15031503}
15041504
15051505
r3597r3598
15441544      {
15451545         /* I'll pulse it because if I used hold-line I'm not sure
15461546         it would clear - to be checked */
1547         cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI,PULSE_LINE);
1547         cpu_set_input_line(cputag_get_cpu(Machine, "main"), INPUT_LINE_NMI,PULSE_LINE);
15481548      }
15491549   }
15501550
r3597r3598
15711571      case 2:
15721572      case 3:
15731573         /* 8271 registers */
1574         ret=i8271_r(machine, offset);
1574         ret=i8271_r(space, offset);
15751575         logerror("  %d\n",ret);
15761576         return ret;
15771577      case 4:
1578         ret=i8271_data_r(machine, offset);
1578         ret=i8271_data_r(space, offset);
15791579         logerror("  %d\n",ret);
15801580         return ret;
15811581      default:
r3597r3598
15961596      case 2:
15971597      case 3:
15981598         /* 8271 registers */
1599         i8271_w(machine, offset, data);
1599         i8271_w(space, offset, data);
16001600         return;
16011601      case 4:
1602         i8271_data_w(machine, offset, data);
1602         i8271_data_w(space, offset, data);
16031603         return;
16041604      default:
16051605         break;
r3597r3598
17521752   switch (offset)
17531753   {
17541754   case 4:
1755      retval=wd17xx_status_r(machine, 0);
1755      retval=wd17xx_status_r(space, 0);
17561756      break;
17571757   case 5:
1758      retval=wd17xx_track_r(machine, 0);
1758      retval=wd17xx_track_r(space, 0);
17591759      break;
17601760   case 6:
1761      retval=wd17xx_sector_r(machine, 0);
1761      retval=wd17xx_sector_r(space, 0);
17621762      break;
17631763   case 7:
1764      retval=wd17xx_data_r(machine, 0);
1764      retval=wd17xx_data_r(space, 0);
17651765      break;
17661766   default:
17671767      break;
r3597r3598
17771777   switch (offset)
17781778   {
17791779   case 0:
1780      bbc_wd177x_status_w(machine, 0, data);
1780      bbc_wd177x_status_w(space, 0, data);
17811781      break;
17821782   case 4:
1783      wd17xx_command_w(machine, 0, data);
1783      wd17xx_command_w(space, 0, data);
17841784      break;
17851785   case 5:
1786      wd17xx_track_w(machine, 0, data);
1786      wd17xx_track_w(space, 0, data);
17871787      break;
17881788   case 6:
1789      wd17xx_sector_w(machine, 0, data);
1789      wd17xx_sector_w(space, 0, data);
17901790      break;
17911791   case 7:
1792      wd17xx_data_w(machine, 0, data);
1792      wd17xx_data_w(space, 0, data);
17931793      break;
17941794   default:
17951795      break;
r3597r3598
18721872         switch (offset)
18731873         {
18741874            case 0xf8:
1875               return wd17xx_status_r(machine, 0);
1875               return wd17xx_status_r(space, 0);
18761876               break;
18771877            case 0xf9:
1878               return wd17xx_track_r(machine, 0);
1878               return wd17xx_track_r(space, 0);
18791879               break;
18801880            case 0xfa:
1881               return wd17xx_sector_r(machine, 0);
1881               return wd17xx_sector_r(space, 0);
18821882               break;
18831883            case 0xfb:
1884               return wd17xx_data_r(machine, 0);
1884               return wd17xx_data_r(space, 0);
18851885               break;
18861886         }
18871887
18881888      } else {
1889         return memory_region(machine, "disks")[offset+(opusbank<<8)];
1889         return memory_region(space->machine, "disks")[offset+(opusbank<<8)];
18901890      }
18911891   }
18921892   return 0xff;
r3597r3598
19031903         switch (offset)
19041904         {
19051905            case 0xf8:
1906               wd17xx_command_w(machine, 0, data);
1906               wd17xx_command_w(space, 0, data);
19071907               break;
19081908            case 0xf9:
1909               wd17xx_track_w(machine, 0, data);
1909               wd17xx_track_w(space, 0, data);
19101910               break;
19111911            case 0xfa:
1912               wd17xx_sector_w(machine, 0, data);
1912               wd17xx_sector_w(space, 0, data);
19131913               break;
19141914            case 0xfb:
1915               wd17xx_data_w(machine, 0, data);
1915               wd17xx_data_w(space, 0, data);
19161916               break;
19171917            case 0xfc:
1918               bbc_opus_status_w(machine, 0,data);
1918               bbc_opus_status_w(space, 0,data);
19191919               break;
19201920            case 0xfe:
19211921               opusbank=(opusbank & 0xff) | (data<<8);
r3597r3598
19251925               break;
19261926         }
19271927      } else {
1928         memory_region(machine, "disks")[offset+(opusbank<<8)]=data;
1928         memory_region(space->machine, "disks")[offset+(opusbank<<8)]=data;
19291929      }
19301930   }
19311931}
r3597r3598
19421942   switch (offset)
19431943   {
19441944   case 0:
1945      retval=wd17xx_status_r(machine, 0);
1945      retval=wd17xx_status_r(space, 0);
19461946      break;
19471947   case 1:
1948      retval=wd17xx_track_r(machine, 0);
1948      retval=wd17xx_track_r(space, 0);
19491949      break;
19501950   case 2:
1951      retval=wd17xx_sector_r(machine, 0);
1951      retval=wd17xx_sector_r(space, 0);
19521952      break;
19531953   case 3:
1954      retval=wd17xx_data_r(machine, 0);
1954      retval=wd17xx_data_r(space, 0);
19551955      break;
19561956   default:
19571957      break;
r3597r3598
19661966   switch (offset)
19671967   {
19681968   case 0:
1969      wd17xx_command_w(machine, 0, data);
1969      wd17xx_command_w(space, 0, data);
19701970      break;
19711971   case 1:
1972      wd17xx_track_w(machine, 0, data);
1972      wd17xx_track_w(space, 0, data);
19731973      break;
19741974   case 2:
1975      wd17xx_sector_w(machine, 0, data);
1975      wd17xx_sector_w(space, 0, data);
19761976      break;
19771977   case 3:
1978      wd17xx_data_w(machine, 0, data);
1978      wd17xx_data_w(space, 0, data);
19791979      break;
19801980   default:
19811981      break;
r3597r3598
20262026   switch (bbc_DFSType){
20272027   /* case 0 to 3 are all standard 8271 interfaces */
20282028   case 0: case 1: case 2: case 3:
2029      return bbc_i8271_read(machine, offset);
2029      return bbc_i8271_read(space, offset);
20302030      break;
20312031   /* case 4 is the acown 1770 interface */
20322032   case 4:
2033      return bbc_wd1770_read(machine, offset);
2033      return bbc_wd1770_read(space, offset);
20342034      break;
20352035   /* case 5 is the watford 1770 interface */
20362036   case 5:
2037      return bbc_wd1770_read(machine, offset);
2037      return bbc_wd1770_read(space, offset);
20382038      break;
20392039   /* case 6 is the Opus challenger interface */
20402040   case 6:
r3597r3598
20522052   switch (bbc_DFSType){
20532053   /* case 0 to 3 are all standard 8271 interfaces */
20542054   case 0: case 1: case 2: case 3:
2055      bbc_i8271_write(machine, offset,data);
2055      bbc_i8271_write(space, offset,data);
20562056      break;
20572057   /* case 4 is the acown 1770 interface */
20582058   case 4:
2059      bbc_wd1770_write(machine, offset,data);
2059      bbc_wd1770_write(space, offset,data);
20602060      break;
20612061   /* case 5 is the watford 1770 interface */
20622062   case 5:
2063      bbc_wd1770_write(machine, offset,data);
2063      bbc_wd1770_write(space, offset,data);
20642064      break;
20652065   /* case 6 is the Opus challenger interface */
20662066   case 6:
r3597r3598
21392139MACHINE_RESET( bbca )
21402140{
21412141   UINT8 *ram = memory_region(machine, "main");
2142   memory_set_bankptr(1,ram);
2143   memory_set_bankptr(3,ram);
2142   memory_set_bankptr(machine, 1,ram);
2143   memory_set_bankptr(machine, 3,ram);
21442144
2145   memory_set_bankptr(4,memory_region(machine, "user1"));          /* bank 4 is the paged ROMs     from 8000 to bfff */
2146   memory_set_bankptr(7,memory_region(machine, "user1")+0x10000);  /* bank 7 points at the OS rom  from c000 to ffff */
2145   memory_set_bankptr(machine, 4,memory_region(machine, "user1"));          /* bank 4 is the paged ROMs     from 8000 to bfff */
2146   memory_set_bankptr(machine, 7,memory_region(machine, "user1")+0x10000);  /* bank 7 points at the OS rom  from c000 to ffff */
21472147
21482148   via_reset();
21492149
r3597r3598
21862186   bbc_SWRAMtype=(input_port_read(machine, "BBCCONFIG")>>3)&0x03;
21872187   bbc_RAMSize=  (input_port_read(machine, "BBCCONFIG")>>5)&0x01;
21882188
2189   memory_set_bankptr(1,ram);
2189   memory_set_bankptr(machine, 1,ram);
21902190   if (bbc_RAMSize)
21912191   {
21922192      /* 32K Model B */
2193      memory_set_bankptr(3,ram+0x4000);
2193      memory_set_bankptr(machine, 3,ram+0x4000);
21942194      set_video_memory_lookups(32);
21952195   } else {
21962196      /* 16K just repeat the lower 16K*/
2197      memory_set_bankptr(3,ram);
2197      memory_set_bankptr(machine, 3,ram);
21982198      set_video_memory_lookups(16);
21992199   }
22002200
2201   memory_set_bankptr(4,memory_region(machine, "user1"));          /* bank 4 is the paged ROMs     from 8000 to bfff */
2202   memory_set_bankptr(7,memory_region(machine, "user1")+0x40000);  /* bank 7 points at the OS rom  from c000 to ffff */
2201   memory_set_bankptr(machine, 4,memory_region(machine, "user1"));          /* bank 4 is the paged ROMs     from 8000 to bfff */
2202   memory_set_bankptr(machine, 7,memory_region(machine, "user1")+0x40000);  /* bank 7 points at the OS rom  from c000 to ffff */
22032203
22042204   via_reset();
22052205
r3597r3598
22232223
22242224MACHINE_START( bbcbp )
22252225{
2226   memory_set_opbase_handler(0, bbcbp_opbase_handler);
2226   memory_set_direct_update_handler( cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM), bbcbp_direct_handler);
22272227
22282228   /* bank 6 is the paged ROMs     from b000 to bfff */
2229   memory_configure_bank(6, 0, 16, memory_region(machine, "user1") + 0x3000, 1<<14);
2229   memory_configure_bank(machine, 6, 0, 16, memory_region(machine, "user1") + 0x3000, 1<<14);
22302230
22312231   via_config(0, &bbcb_system_via);
22322232   via_set_clock(0,1000000);
r3597r3598
22392239
22402240MACHINE_RESET( bbcbp )
22412241{
2242   memory_set_bankptr(1,memory_region(machine, "main"));
2243   memory_set_bankptr(2,memory_region(machine, "main")+0x03000);  /* bank 2 screen/shadow ram     from 3000 to 7fff */
2244   memory_set_bankptr(4,memory_region(machine, "user1"));         /* bank 4 is paged ROM or RAM   from 8000 to afff */
2245   memory_set_bank(6, 0);
2246   memory_set_bankptr(7,memory_region(machine, "user1")+0x40000); /* bank 7 points at the OS rom  from c000 to ffff */
2242   memory_set_bankptr(machine, 1,memory_region(machine, "main"));
2243   memory_set_bankptr(machine, 2,memory_region(machine, "main")+0x03000);  /* bank 2 screen/shadow ram     from 3000 to 7fff */
2244   memory_set_bankptr(machine, 4,memory_region(machine, "user1"));         /* bank 4 is paged ROM or RAM   from 8000 to afff */
2245   memory_set_bank(machine, 6, 0);
2246   memory_set_bankptr(machine, 7,memory_region(machine, "user1")+0x40000); /* bank 7 points at the OS rom  from c000 to ffff */
22472247
22482248   via_reset();
22492249
r3597r3598
22602260
22612261MACHINE_START( bbcm )
22622262{
2263   memory_set_opbase_handler(0, bbcm_opbase_handler);
2263   memory_set_direct_update_handler( cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM ), bbcm_direct_handler);
22642264
22652265   /* bank 5 is the paged ROMs     from 9000 to bfff */
2266   memory_configure_bank(5, 0, 16, memory_region(machine, "user1")+0x01000, 1<<14);
2266   memory_configure_bank(machine, 5, 0, 16, memory_region(machine, "user1")+0x01000, 1<<14);
22672267
22682268   /* Set ROM/IO bank to point to rom */
2269   memory_set_bankptr( 8, memory_region(machine, "user1")+0x43c00);
2270   memory_install_read_handler(machine, 0, ADDRESS_SPACE_PROGRAM,0xFC00,0xFEFF,0,0,8);
2269   memory_set_bankptr( machine, 8, memory_region(machine, "user1")+0x43c00);
2270   memory_install_read_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM),0xFC00,0xFEFF,0,0,8);
22712271
22722272   via_config(0, &bbcb_system_via);
22732273   via_set_clock(0,1000000);
r3597r3598
22802280
22812281MACHINE_RESET( bbcm )
22822282{
2283   memory_set_bankptr(1,memory_region(machine, "main"));         /* bank 1 regular lower ram      from 0000 to 2fff */
2284   memory_set_bankptr(2,memory_region(machine, "main")+0x3000);   /* bank 2 screen/shadow ram      from 3000 to 7fff */
2285   memory_set_bankptr(4,memory_region(machine, "user1"));         /* bank 4 is paged ROM or RAM   from 8000 to 8fff */
2286   memory_set_bank(5, 0);
2287   memory_set_bankptr(7,memory_region(machine, "user1")+0x40000); /* bank 6 OS rom of RAM         from c000 to dfff */
2283   memory_set_bankptr(machine, 1,memory_region(machine, "main"));         /* bank 1 regular lower ram      from 0000 to 2fff */
2284   memory_set_bankptr(machine, 2,memory_region(machine, "main")+0x3000);   /* bank 2 screen/shadow ram      from 3000 to 7fff */
2285   memory_set_bankptr(machine, 4,memory_region(machine, "user1"));         /* bank 4 is paged ROM or RAM   from 8000 to 8fff */
2286   memory_set_bank(machine, 5, 0);
2287   memory_set_bankptr(machine, 7,memory_region(machine, "user1")+0x40000); /* bank 6 OS rom of RAM         from c000 to dfff */
22882288
22892289   via_reset();
22902290
src/mess/drivers/z88.c
r3597r3598
101101         /* column has gone low in snooze/coma */
102102         blink.sta |= STA_KEY;
103103
104         cpu_trigger(machine, Z88_SNOOZE_TRIGGER);
104         cpuexec_trigger(machine, Z88_SNOOZE_TRIGGER);
105105
106106         z88_interrupt_refresh(machine);
107107      }
r3597r3598
178178
179179static void z88_install_memory_handler_pair(running_machine *machine, offs_t start, offs_t size, int bank_base, void *read_addr, void *write_addr)
180180{
181   read8_machine_func read_handler;
182   write8_machine_func write_handler;
181   read8_space_func read_handler;
182   write8_space_func write_handler;
183183
184184   /* special case */
185185   if (read_addr == NULL)
186186      read_addr = &memory_region(machine, "main")[start];
187187
188188   /* determine the proper pointers to use */
189   read_handler  = (read_addr != NULL)  ? (read8_machine_func)  (STATIC_BANK1 + (FPTR)(bank_base - 1 + 0)) : SMH_UNMAP;
190   write_handler = (write_addr != NULL) ? (write8_machine_func) (STATIC_BANK1 + (FPTR)(bank_base - 1 + 1)) : SMH_UNMAP;
189   read_handler  = (read_addr != NULL)  ? (read8_space_func)  (STATIC_BANK1 + (FPTR)(bank_base - 1 + 0)) : SMH_UNMAP;
190   write_handler = (write_addr != NULL) ? (write8_space_func) (STATIC_BANK1 + (FPTR)(bank_base - 1 + 1)) : SMH_UNMAP;
191191
192192   /* install the handlers */
193   memory_install_read8_handler(machine, 0,  ADDRESS_SPACE_PROGRAM, start, start + size - 1, 0, 0, read_handler);
194   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, start, start + size - 1, 0, 0, write_handler);
193   memory_install_read8_handler(cpu_get_address_space(machine->cpu[0],  ADDRESS_SPACE_PROGRAM ), start, start + size - 1, 0, 0, read_handler);
194   memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM ), start, start + size - 1, 0, 0, write_handler);
195195
196196   /* and set the banks */
197197   if (read_addr != NULL)
198      memory_set_bankptr(bank_base + 0, read_addr);
198      memory_set_bankptr(machine, bank_base + 0, read_addr);
199199   if (write_addr != NULL)
200      memory_set_bankptr(bank_base + 1, write_addr);
200      memory_set_bankptr(machine, bank_base + 1, write_addr);
201201}
202202
203203
r3597r3598
371371{
372372   blink.mem[offset] = data;
373373
374   z88_refresh_memory_bank(machine, offset);
374   z88_refresh_memory_bank(space->machine, offset);
375375}
376376/*
377377 00b0 00
r3597r3598
414414
415415         /* refresh ints */
416416         z88_update_rtc_interrupt();
417         z88_interrupt_refresh(machine);
417         z88_interrupt_refresh(space->machine);
418418      }
419419      return;
420420
r3597r3598
428428
429429         /* refresh ints */
430430         z88_update_rtc_interrupt();
431         z88_interrupt_refresh(machine);
431         z88_interrupt_refresh(space->machine);
432432      }
433433      return;
434434
r3597r3598
468468
469469         if ((changed_bits & (1<<2))!=0)
470470         {
471            z88_refresh_memory_bank(machine, 0);
471            z88_refresh_memory_bank(space->machine, 0);
472472         }
473473      }
474474      return;
r3597r3598
480480
481481         blink.ints = data;
482482         z88_update_rtc_interrupt();
483         z88_interrupt_refresh(machine);
483         z88_interrupt_refresh(space->machine);
484484      }
485485      return;
486486
r3597r3598
494494
495495         blink.ints &= ~blink.ack;
496496         z88_update_rtc_interrupt();
497         z88_interrupt_refresh(machine);
497         z88_interrupt_refresh(space->machine);
498498      }
499499      return;
500500
r3597r3598
504504      case 0x0d1:
505505      case 0x0d2:
506506      case 0x0d3:
507         blink_srx_w(machine, port & 0x03, data);
507         blink_srx_w(space, port & 0x03, data);
508508         return;
509509   }
510510
r3597r3598
540540         {
541541            blink.z88_state = Z88_SNOOZE;
542542            /* spin cycles until rtc timer */
543            cpu_spinuntil_trigger (Z88_SNOOZE_TRIGGER);
543            cpu_spinuntil_trigger( space->machine->cpu[0], Z88_SNOOZE_TRIGGER);
544544
545545            logerror("z88 entering snooze!\n");
546546         }
547547
548548
549549         if ((lines & 0x080)==0)
550            data &=input_port_read(machine, "LINE7");
550            data &=input_port_read(space->machine, "LINE7");
551551
552552         if ((lines & 0x040)==0)
553            data &=input_port_read(machine, "LINE6");
553            data &=input_port_read(space->machine, "LINE6");
554554
555555         if ((lines & 0x020)==0)
556            data &=input_port_read(machine, "LINE5");
556            data &=input_port_read(space->machine, "LINE5");
557557
558558         if ((lines & 0x010)==0)
559            data &=input_port_read(machine, "LINE4");
559            data &=input_port_read(space->machine, "LINE4");
560560
561561         if ((lines & 0x008)==0)
562            data &=input_port_read(machine, "LINE3");
562            data &=input_port_read(space->machine, "LINE3");
563563
564564         if ((lines & 0x004)==0)
565            data &=input_port_read(machine, "LINE2");
565            data &=input_port_read(space->machine, "LINE2");
566566
567567         if ((lines & 0x002)==0)
568            data &=input_port_read(machine, "LINE1");
568            data &=input_port_read(space->machine, "LINE1");
569569
570570         if ((lines & 0x001)==0)
571            data &=input_port_read(machine, "LINE0");
571            data &=input_port_read(space->machine, "LINE0");
572572
573573         logerror("lines: %02x\n",lines);
574574         logerror("key r: %02x\n",data);
src/mess/drivers/p2000t.c
r3597r3598
208208
209209static INTERRUPT_GEN( p2000_interrupt )
210210{
211   cpu_set_input_line(machine->cpu[0], 0, HOLD_LINE);
211   cpu_set_input_line(device->machine->cpu[0], 0, HOLD_LINE);
212212}
213213
214214/* Machine definition */
src/mess/drivers/osi.c
r3597r3598
7979{
8080   UINT8 key_column_data = 0xff;
8181
82   if (!(key_row_latch & 0x01)) key_column_data &= input_port_read(machine, "ROW0");
83   if (!(key_row_latch & 0x02)) key_column_data &= input_port_read(machine, "ROW1");
84   if (!(key_row_latch & 0x04)) key_column_data &= input_port_read(machine, "ROW2");
85   if (!(key_row_latch & 0x08)) key_column_data &= input_port_read(machine, "ROW3");
86   if (!(key_row_latch & 0x10)) key_column_data &= input_port_read(machine, "ROW4");
87   if (!(key_row_latch & 0x20)) key_column_data &= input_port_read(machine, "ROW5");
88   if (!(key_row_latch & 0x40)) key_column_data &= input_port_read(machine, "ROW6");
89   if (!(key_row_latch & 0x80)) key_column_data &= input_port_read(machine, "ROW7");
82   if (!(key_row_latch & 0x01)) key_column_data &= input_port_read(space->machine, "ROW0");
83   if (!(key_row_latch & 0x02)) key_column_data &= input_port_read(space->machine, "ROW1");
84   if (!(key_row_latch & 0x04)) key_column_data &= input_port_read(space->machine, "ROW2");
85   if (!(key_row_latch & 0x08)) key_column_data &= input_port_read(space->machine, "ROW3");
86   if (!(key_row_latch & 0x10)) key_column_data &= input_port_read(space->machine, "ROW4");
87   if (!(key_row_latch & 0x20)) key_column_data &= input_port_read(space->machine, "ROW5");
88   if (!(key_row_latch & 0x40)) key_column_data &= input_port_read(space->machine, "ROW6");
89   if (!(key_row_latch & 0x80)) key_column_data &= input_port_read(space->machine, "ROW7");
9090
9191   return key_column_data;
9292}
r3597r3598
9494static WRITE8_HANDLER ( sb2m600b_keyboard_w )
9595{
9696   key_row_latch = data;
97   discrete_sound_w(machine, NODE_01, (data >> 2) & 0x0f);
97   discrete_sound_w(space, NODE_01, (data >> 2) & 0x0f);
9898}
9999
100100static WRITE8_HANDLER ( uk101_keyboard_w )
src/mess/drivers/acrnsys1.c
r3597r3598
3535
3636static WRITE8_DEVICE_HANDLER( ins8154_b1_port_a_w )
3737{
38   ttl74145_0_w(device->machine, 0, data & 0x07);
38   ttl74145_0_w(cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0, data & 0x07);
3939}
4040
4141static WRITE8_DEVICE_HANDLER( acrnsys1_led_segment_w )
src/mess/drivers/a310.c
r3597r3598
233233   {
234234      UINT32 *rom;
235235
236      rom = (UINT32 *)memory_region(machine, "main");
236      rom = (UINT32 *)memory_region(space->machine, "main");
237237
238238      return rom[offset & 0x1fffff];
239239   }
r3597r3598
286286   }
287287}
288288
289static OPBASE_HANDLER( a310_setopbase )
289static DIRECT_UPDATE_HANDLER( a310_setopbase )
290290{
291291   // if we're not in logical memory, MAME can do the right thing
292292   if (address > 0x1ffffff)
r3597r3598
297297   // if the boot ROM is mapped in, do some trickery to make it show up
298298   if (a310_latchrom)
299299   {
300      opbase->mask = 0x1fffff;
301      opbase->mem_min = 0;
302      opbase->mem_max = 0x1fffff;
303      opbase->rom = opbase->ram = memory_region(machine, "main");
300      direct->mask = 0x1fffff;
301      direct->min = 0;
302      direct->max = 0x1fffff;
303      direct->raw = direct->decrypted = memory_region(space->machine, "main");
304304   }
305305   else   // executing from logical memory
306306   {
307307      UINT32 page = address / page_sizes[a310_pagesize];
308308
309      opbase->mask = page_sizes[a310_pagesize]-1;
310      opbase->mem_min = page * page_sizes[a310_pagesize];
311      opbase->mem_max = opbase->mem_min + opbase->mask;
312      opbase->rom = opbase->ram = (UINT8 *)&a310_physmem[(a310_pages[page] * page_sizes[a310_pagesize])>>2];
309      direct->mask = page_sizes[a310_pagesize]-1;
310      direct->min = page * page_sizes[a310_pagesize];
311      direct->max = direct->min + direct->mask;
312      direct->raw = direct->decrypted = (UINT8 *)&a310_physmem[(a310_pages[page] * page_sizes[a310_pagesize])>>2];
313313   }
314314
315315   return ~0;
r3597r3598
317317
318318static DRIVER_INIT(a310)
319319{
320   memory_set_opbase_handler(0, a310_setopbase);
320   memory_set_direct_update_handler( cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM ), a310_setopbase);
321321}
322322
323323static const char *const ioc_regnames[] =
r3597r3598
372372      switch (offset & 0x1f)
373373      {
374374         case 1:   // keyboard read
375            a310_request_irq_b(machine, A310_IRQB_KBD_XMIT_EMPTY);
375            a310_request_irq_b(space->machine, A310_IRQB_KBD_XMIT_EMPTY);
376376            break;
377377
378378         case 16:   // timer 0 read
r3597r3598
401401            break;
402402      }
403403
404      logerror("IOC: R %s = %02x (PC=%x)\n", ioc_regnames[offset&0x1f], a310_iocregs[offset&0x1f], activecpu_get_pc());
404      logerror("IOC: R %s = %02x (PC=%x)\n", ioc_regnames[offset&0x1f], a310_iocregs[offset&0x1f], cpu_get_pc( space->cpu ));
405405      return a310_iocregs[offset&0x1f];
406406   }
407407   else if (offset >= 0xc4000 && offset <= 0xc4010)
408408   {
409409      logerror("17XX: R @ addr %x mask %08x\n", offset*4, mem_mask);
410      return wd17xx_data_r(machine, offset&0xf);
410      return wd17xx_data_r(space, offset&0xf);
411411   }
412412   else
413413   {
r3597r3598
422422{
423423   if (offset >= 0x80000 && offset < 0xc0000)
424424   {
425//      logerror("IOC: W %02x @ reg %s (PC=%x)\n", data&0xff, ioc_regnames[offset&0x1f], activecpu_get_pc());
425//      logerror("IOC: W %02x @ reg %s (PC=%x)\n", data&0xff, ioc_regnames[offset&0x1f], cpu_get_pc( space->cpu ));
426426
427427      switch (offset&0x1f)
428428      {
r3597r3598
436436            // if that did it, clear the IRQ
437437            if (a310_iocregs[4] == 0)
438438            {
439               cpu_set_input_line(machine->cpu[0], ARM_IRQ_LINE, CLEAR_LINE);
439               cpu_set_input_line(space->machine->cpu[0], ARM_IRQ_LINE, CLEAR_LINE);
440440            }
441441            break;
442442
r3597r3598
504504   else if (offset >= 0xc4000 && offset <= 0xc4010)
505505   {
506506      logerror("17XX: %x to addr %x mask %08x\n", data, offset*4, mem_mask);
507      wd17xx_data_w(machine, offset&0xf, data&0xff);
507      wd17xx_data_w(space, offset&0xf, data&0xff);
508508   }
509509   else if (offset == 0xd40006)
510510   {
r3597r3598
586586            a310_vidregs[0x80], a310_vidregs[0xa0],
587587            visarea.max_x, visarea.max_y);
588588
589         video_screen_configure(machine->primary_screen, a310_vidregs[0x80], a310_vidregs[0xa0], &visarea, video_screen_get_frame_period(machine->primary_screen).attoseconds);
589         video_screen_configure(space->machine->primary_screen, a310_vidregs[0x80], a310_vidregs[0xa0], &visarea, video_screen_get_frame_period(space->machine->primary_screen).attoseconds);
590590
591591         // slightly hacky: fire off a VBL right now.  the BIOS doesn't wait long enough otherwise.
592592         timer_adjust_oneshot(vbl_timer, attotime_zero, 0);
src/mess/drivers/bbc.c
r3597r3598
696696
697697static INTERRUPT_GEN( bbcb_vsync )
698698{
699   via_0_ca1_w(machine, 0,1);
700   via_0_ca1_w(machine, 0,0);
699   via_0_ca1_w(cpu_get_address_space( device->machine->cpu[0], ADDRESS_SPACE_PROGRAM ), 0,1);
700   via_0_ca1_w(cpu_get_address_space( device->machine->cpu[0], ADDRESS_SPACE_PROGRAM ), 0,0);
701701   bbc_frameclock();
702702}
703703
src/mess/drivers/bbcbc.c
r3597r3598
2929
3030static void tms_interrupt(running_machine *machine, int dummy)
3131{
32   cpunum_set_input_line(machine, 0, 0, HOLD_LINE);
32   cpu_set_input_line(machine->cpu[0], 0, HOLD_LINE);
3333}
3434
3535static INTERRUPT_GEN( bbcbc_interrupt )
3636{
37    TMS9928A_interrupt(machine);
37    TMS9928A_interrupt(device->machine);
3838}
3939
4040static const TMS9928a_interface tms9129_interface =
r3597r3598
4646};
4747
4848/* TODO */
49static Z80PIO_INTERFACE( bbcbc_z80pio_intf )
49static const z80pio_interface bbcbc_z80pio_intf =
5050{
51   "main",
52   0,
53   NULL,
54   NULL,
55   NULL,
56   NULL,
57   NULL,
58   NULL,
59   NULL
51   NULL,   /* int callback */
52   NULL,   /* port a read */
53   NULL,   /* port b read */
54   NULL,   /* port a write */
55   NULL,   /* port b write */
56   NULL,   /* ready a */
57   NULL   /* ready b */
6058};
6159
6260static MACHINE_START( bbcbc )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team