Previous 15994 Revisions Next

r931 Thursday 6th September, 2007 at 12:18:56 UTC by Nathan Woods
[PC] Fixed more fallout from the I8086 change to 16-bit
[src/mess/includes]amstr_pc.h
[src/mess/machine]amstr_pc.c pc.c
[src/mess/video]pc_aga.c pc_aga.h pc_cga.c pc_cga.h pc_vga.c pc_vga.h

src/mess/includes/amstr_pc.h
r930r931
1616
1717READ16_HANDLER( pc200_16le_port378_r );
1818READ16_HANDLER( pc1640_16le_port378_r );
19READ16_HANDLER( pc1640_16le_port3d0_r );
20READ16_HANDLER( pc1640_16le_port4278_r );
21READ16_HANDLER( pc1640_16le_port278_r );
1922
2023
2124#define PC200_MODE (input_port_1_r(0)&0x30)
src/mess/video/pc_vga.c
r930r931
14411441   return vga.svga_intf.vram_size;
14421442}
14431443
1444
1445
1446READ16_HANDLER( vga_port16le_03b0_r ) { return read16le_with_read8_handler(vga_port_03b0_r, offset, mem_mask); }
1447READ16_HANDLER( vga_port16le_03c0_r ) { return read16le_with_read8_handler(vga_port_03c0_r, offset, mem_mask); }
1448READ16_HANDLER( vga_port16le_03d0_r ) { return read16le_with_read8_handler(vga_port_03d0_r, offset, mem_mask); }
1449WRITE16_HANDLER( vga_port16le_03b0_w ) { write16le_with_write8_handler(vga_port_03b0_w, offset, data, mem_mask); }
1450WRITE16_HANDLER( vga_port16le_03c0_w ) { write16le_with_write8_handler(vga_port_03c0_w, offset, data, mem_mask); }
1451WRITE16_HANDLER( vga_port16le_03d0_w ) { write16le_with_write8_handler(vga_port_03d0_w, offset, data, mem_mask); }
1452
1453READ16_HANDLER( paradise_ega16le_03c0_r ) { return read16le_with_read8_handler(paradise_ega_03c0_r, offset, mem_mask); }
src/mess/video/pc_vga.h
r930r931
4747READ8_HANDLER( ega_port_03d0_r );
4848
4949READ8_HANDLER( paradise_ega_03c0_r );
50READ16_HANDLER( paradise_ega16le_03c0_r );
5051
5152READ8_HANDLER( vga_port_03b0_r );
5253READ8_HANDLER( vga_port_03c0_r );
5354READ8_HANDLER( vga_port_03d0_r );
54
5555WRITE8_HANDLER( vga_port_03b0_w );
5656WRITE8_HANDLER( vga_port_03c0_w );
5757WRITE8_HANDLER( vga_port_03d0_w );
5858
59READ16_HANDLER( vga_port16le_03b0_r );
60READ16_HANDLER( vga_port16le_03c0_r );
61READ16_HANDLER( vga_port16le_03d0_r );
62WRITE16_HANDLER( vga_port16le_03b0_w );
63WRITE16_HANDLER( vga_port16le_03c0_w );
64WRITE16_HANDLER( vga_port16le_03d0_w );
65
5966/*
6067  pega notes (paradise)
6168  build in amstrad pc1640
src/mess/video/pc_aga.c
r930r931
55#include "includes/amstr_pc.h"
66#include "video/pc_video.h"
77#include "video/generic.h"
8#include "memconv.h"
89
910static pc_video_update_proc pc_aga_choosevideomode(int *width, int *height, struct crtc6845 *crtc);
1011
r930r931
152153      pc_cga8_w(offset, data);
153154}
154155
156static READ16_HANDLER ( pc16le_aga_mda_r ) { return read16le_with_read8_handler(pc_aga_mda_r, offset, mem_mask); }
157static WRITE16_HANDLER ( pc16le_aga_mda_w ) { write16le_with_write8_handler(pc_aga_mda_w, offset, data, mem_mask); }
158static READ16_HANDLER ( pc16le_aga_cga_r ) { return read16le_with_read8_handler(pc_aga_cga_r, offset, mem_mask); }
159static WRITE16_HANDLER ( pc16le_aga_cga_w ) { write16le_with_write8_handler(pc_aga_cga_w, offset, data, mem_mask); }
155160
156161
162
157163/*************************************/
158164
159165void pc_aga_set_mode(AGA_MODE mode)
r930r931
207213   pc_mda_europc_init();
208214
209215   buswidth = cputype_databus_width(Machine->drv->cpu[0].cpu_type, ADDRESS_SPACE_PROGRAM);
210   switch(buswidth) {
211   case 8:
212      memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_r );
213      memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_w );
214      memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc_aga_cga_r );
215      memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc_aga_cga_w );
216      break;
216   switch(buswidth)
217   {
218      case 8:
219         memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_r );
220         memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_w );
221         memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc_aga_cga_r );
222         memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc_aga_cga_w );
223         break;
217224
218   default:
219      fatalerror("CGA:  Bus width %d not supported\n", buswidth);
220      break;
225      case 16:
226         memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc16le_aga_mda_r );
227         memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc16le_aga_mda_w );
228         memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc16le_aga_cga_r );
229         memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc16le_aga_cga_w );
230         break;
231
232      default:
233         fatalerror("CGA:  Bus width %d not supported\n", buswidth);
234         break;
221235   }
222236
223237   pc_video_start(&config, pc_aga_choosevideomode, videoram_size);
r930r931
232246   video_start_pc_aga(machine);
233247
234248   buswidth = cputype_databus_width(Machine->drv->cpu[0].cpu_type, ADDRESS_SPACE_PROGRAM);
235   switch(buswidth) {
236   case 8:
237      memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_r );
238      memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_w );
239      break;
249   switch(buswidth)
250   {
251      case 8:
252         memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_r );
253         memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_w );
254         break;
240255
241   default:
242      fatalerror("CGA:  Bus width %d not supported\n", buswidth);
243      break;
256      case 16:
257         memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga16le_r );
258         memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga16le_w );
259         break;
260
261      default:
262         fatalerror("CGA:  Bus width %d not supported\n", buswidth);
263         break;
244264   }
245265}
246266
r930r931
291311   return 0;
292312}
293313
294WRITE8_HANDLER ( pc200_videoram_w )
314READ8_HANDLER( pc200_videoram_r )
295315{
296   switch (aga.mode) {
297   default:
298      if (offset>=0x8000)
299         pc_video_videoram_w(offset-0x8000, data);
300      break;
301   case AGA_MONO:
302      pc_video_videoram_w(offset,data);
303      break;
316   switch (aga.mode)
317   {
318      default:
319         if (offset>=0x8000) return videoram[offset-0x8000];
320         return 0;
321      case AGA_MONO:
322         return videoram[offset];
304323   }
324   return 0;
305325}
306326
307 READ8_HANDLER( pc200_videoram_r )
327WRITE8_HANDLER ( pc200_videoram_w )
308328{
309   switch (aga.mode) {
310   default:
311      if (offset>=0x8000) return videoram[offset-0x8000];
312      return 0;
313   case AGA_MONO:
314      return videoram[offset];
329   switch (aga.mode)
330   {
331      default:
332         if (offset>=0x8000)
333            pc_video_videoram_w(offset-0x8000, data);
334         break;
335      case AGA_MONO:
336         pc_video_videoram_w(offset,data);
337         break;
315338   }
316   return 0;
317339}
318340
341READ16_HANDLER( pc200_videoram16le_r )   { return read16le_with_read8_handler(pc200_videoram_r, offset, mem_mask); }
342WRITE16_HANDLER( pc200_videoram16le_w )   { write16le_with_write8_handler(pc200_videoram_w, offset, data, mem_mask); }
319343
320344
321345static struct {
r930r931
364388   }
365389}
366390
367 READ8_HANDLER ( pc200_cga_r )
391READ8_HANDLER ( pc200_cga_r )
368392{
369393   UINT8 result = 0;
370394
r930r931
391415   }
392416   return result;
393417}
418
419READ16_HANDLER( pc200_cga16le_r ) { return read16le_with_read8_handler(pc200_cga_r, offset, mem_mask); }
420WRITE16_HANDLER( pc200_cga16le_w ) { write16le_with_write8_handler(pc200_cga_w, offset, data, mem_mask); }
src/mess/video/pc_cga.c
r930r931
13291329   UINT8 read;
13301330} pc1512;
13311331
1332WRITE8_HANDLER ( pc1512_w )
1332static WRITE8_HANDLER ( pc1512_w )
13331333{
13341334   UINT8 char_height;
13351335
r930r931
13751375   }
13761376}
13771377
1378 READ8_HANDLER ( pc1512_r )
1378READ8_HANDLER ( pc1512_r )
13791379{
13801380   UINT8 data;
13811381
r930r931
13961396}
13971397
13981398
1399WRITE8_HANDLER ( pc1512_videoram_w )
1399static WRITE8_HANDLER ( pc1512_videoram_w )
14001400{
14011401   if (pc1512.write & 1)
14021402      videoram[offset+videoram_offset[0]] = data; /* blue plane */
r930r931
14131413
14141414
14151415
1416READ16_HANDLER ( pc1512_16le_r ) { return read16le_with_read8_handler(pc1512_r, offset, mem_mask); }
1417WRITE16_HANDLER ( pc1512_16le_w ) { write16le_with_write8_handler(pc1512_w, offset, data, mem_mask); }
1418WRITE16_HANDLER ( pc1512_videoram16le_w ) { write16le_with_write8_handler(pc1512_videoram_w, offset, data, mem_mask); }
1419
1420
1421
14161422VIDEO_START( pc1512 )
14171423{
14181424   videoram = (UINT8*) auto_malloc(0x10000);
src/mess/video/pc_aga.h
r930r931
3737
3838extern void pc_aga_timer(void);
3939
40extern WRITE8_HANDLER ( pc_aga_videoram_w );
41 READ8_HANDLER( pc_aga_videoram_r );
40READ8_HANDLER( pc_aga_videoram_r );
41WRITE8_HANDLER( pc_aga_videoram_w );
4242
43extern WRITE8_HANDLER ( pc200_videoram_w );
44 READ8_HANDLER( pc200_videoram_r );
43READ8_HANDLER( pc200_videoram_r );
44WRITE8_HANDLER( pc200_videoram_w );
45READ16_HANDLER( pc200_videoram16le_r );
46WRITE16_HANDLER( pc200_videoram16le_w );
4547
46extern WRITE8_HANDLER( pc200_cga_w );
47extern  READ8_HANDLER ( pc200_cga_r );
48READ8_HANDLER( pc200_cga_r );
49WRITE8_HANDLER( pc200_cga_w );
50READ16_HANDLER( pc200_cga16le_r );
51WRITE16_HANDLER( pc200_cga16le_w );
4852
4953extern VIDEO_UPDATE( pc_200 );
5054
src/mess/video/pc_cga.h
r930r931
2525
2626VIDEO_START( pc1512 );
2727
28 READ8_HANDLER ( pc1512_r );
29WRITE8_HANDLER ( pc1512_w );
30WRITE8_HANDLER ( pc1512_videoram_w );
28READ16_HANDLER( pc1512_16le_r );
29WRITE16_HANDLER( pc1512_16le_w );
30WRITE16_HANDLER( pc1512_videoram16le_w );
3131
3232#define CGA_FONT      (input_port_20_r(0)&3)
3333
src/mess/machine/pc.c
r930r931
115115    for (i = 0; i < 256; i++)
116116      gfx[i] = i;
117117
118   memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xbffff, 0, 0, pc200_videoram_r );
119   memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xbffff, 0, 0, pc200_videoram_w );
118   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_r );
119   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_w );
120120   videoram_size=0x10000;
121121   videoram=memory_region(REGION_CPU1)+0xb0000;
122/* This is all done in video_start_pc200()
123   // 0x3dd, 0x3d8, 0x3d4, 0x3de are also in mda mode present!?
124   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_r );
125   memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_w );
122   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc200_16le_port378_r );
126123
127   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_MDA_r );
128   memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_MDA_w );
129*/
130   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc200_port378_r );
131
132124   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
133125}
134126
r930r931
141133    for (i = 0; i < 256; i++)
142134      gfx[i] = i;
143135
144   memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbbfff, 0, 0, MRA8_BANK1 );
145   memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbbfff, 0, 0, pc1512_videoram_w );
136   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbbfff, 0, 0, MRA16_BANK1 );
137   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbbfff, 0, 0, pc1512_videoram16le_w );
146138
147   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1512_r );
148   memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1512_w );
139   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1512_16le_r );
140   memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1512_16le_w );
149141
150   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc_parallelport2_r );
142   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc16le_parallelport2_r );
151143
152144
153145   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
r930r931
190182DRIVER_INIT( pc1640 )
191183{
192184   pc_vga_init(&vga_interface, NULL);
193   memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa0000, 0xaffff, 0, 0, MRA8_BANK1 );
194   memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb7fff, 0, 0, MRA8_BANK2 );
195   memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbffff, 0, 0, MRA8_BANK3 );
185   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xa0000, 0xaffff, 0, 0, MRA16_BANK1 );
186   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb7fff, 0, 0, MRA16_BANK2 );
187   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbffff, 0, 0, MRA16_BANK3 );
196188
197   memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa0000, 0xaffff, 0, 0, MWA8_BANK1 );
198   memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb7fff, 0, 0, MWA8_BANK2 );
199   memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbffff, 0, 0, MWA8_BANK3 );
189   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xa0000, 0xaffff, 0, 0, MWA16_BANK1 );
190   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb7fff, 0, 0, MWA16_BANK2 );
191   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbffff, 0, 0, MWA16_BANK3 );
200192
201   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, vga_port_03b0_r );
202   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3c0, 0x3cf, 0, 0, paradise_ega_03c0_r );
203   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1640_port3d0_r );
193   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, vga_port16le_03b0_r );
194   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x3c0, 0x3cf, 0, 0, paradise_ega16le_03c0_r );
195   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1640_16le_port3d0_r );
204196
205   memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, vga_port_03b0_w );
206   memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3c0, 0x3cf, 0, 0, vga_port_03c0_w );
207   memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, vga_port_03d0_w );
197   memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, vga_port16le_03b0_w );
198   memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x3c0, 0x3cf, 0, 0, vga_port16le_03c0_w );
199   memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, vga_port16le_03d0_w );
208200
209   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc1640_port278_r );
210   memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x4278, 0x427b, 0, 0, pc1640_port4278_r );
201   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc1640_16le_port278_r );
202   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x4278, 0x427b, 0, 0, pc1640_16le_port4278_r );
211203
212204   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
213205
src/mess/machine/amstr_pc.c
r930r931
405405
406406READ16_HANDLER( pc200_16le_port378_r ) { return read16le_with_read8_handler(pc200_port378_r, offset, mem_mask); }
407407READ16_HANDLER( pc1640_16le_port378_r ) { return read16le_with_read8_handler(pc1640_port378_r, offset, mem_mask); }
408READ16_HANDLER( pc1640_16le_port3d0_r ) { return read16le_with_read8_handler(pc1640_port3d0_r, offset, mem_mask); }
409READ16_HANDLER( pc1640_16le_port4278_r ) { return read16le_with_read8_handler(pc1640_port4278_r, offset, mem_mask); }
410READ16_HANDLER( pc1640_16le_port278_r ) { return read16le_with_read8_handler(pc1640_port278_r, offset, mem_mask); }

Previous 15994 Revisions Next


© 1998-2018 The MESS Team