Previous 15994 Revisions Next

r7236 Tuesday 2nd February, 2010 at 01:23:07 UTC by Phill Harvey-Smith
Fixed pallette handling in both 40 & 80 col mode.
Fixed most line drawing in 40 col mode, welcome demos now mostly work
Added support for an additional 3 hard disks.
[src/mess/drivers]rmnimbus.c
[src/mess/includes]rmnimbus.h
[src/mess/video]rmnimbus.c

src/mess/video/rmnimbus.c
r7235r7236
140140    }
141141
142142    if(debug_on & DEBUG_TEXT)
143        logerror("Nimbus video IOR at pc=%08X from %04X mask=%04X, data=%04X\n",pc,(offset*2),mem_mask,result);
143        logerror("Nimbus video IOR at %05X from %04X mask=%04X, data=%04X\n",pc,(offset*2),mem_mask,result);
144144   
145145    return result;
146146}
r7235r7236
160160    int pc=cpu_get_pc(space->cpu);
161161
162162    if(debug_on & DEBUG_TEXT)
163        logerror("Nimbus video IOW at %08X write of %04X to %04X mask=%04X\n",pc,data,(offset*2),mem_mask);
163        logerror("Nimbus video IOW at %05X write of %04X to %04X mask=%04X\n",pc,data,(offset*2),mem_mask);
164164
165165    if(debug_on & DEBUG_DB)
166166        logerror("dw %05X,%05X\n",(offset*2),data);
r7235r7236
190190        case    reg022  : vidregs[reg022]=data; break;
191191        case    reg024  : vidregs[reg024]=data; break;
192192        case    reg026  : vidregs[reg026]=data; write_reg_026(); break;
193        case    reg028  : vidregs[reg028]=data; change_palette(space->machine,0,data); break;
194        case    reg02A  : vidregs[reg02A]=data; change_palette(space->machine,1,data); break;
195        case    reg02C  : vidregs[reg02C]=data; change_palette(space->machine,2,data); break;
196        case    reg02E  : vidregs[reg02E]=data; change_palette(space->machine,3,data); break;
193        case    reg028  : vidregs[reg028]=data; change_palette(space->machine,(IS_80COL ? 0 : 0),data); break;
194        case    reg02A  : vidregs[reg02A]=data; change_palette(space->machine,(IS_80COL ? 1 : 4),data); break;
195        case    reg02C  : vidregs[reg02C]=data; change_palette(space->machine,(IS_80COL ? 2 : 8),data); break;
196        case    reg02E  : vidregs[reg02E]=data; change_palette(space->machine,(IS_80COL ? 3 : 12),data); break;
197197       
198198        default         : break;
199199    }
r7235r7236
204204    if(debug_on & (DEBUG_TEXT | DEBUG_PIXEL))
205205        logerror("set_pixel(x=%04X, y=%04X, colour=%04X), IS_XOR=%02X\n",x,y,colour,IS_XOR);
206206   
207    if(IS_80COL)
208        colour&=0x03;
207209
208210    if((x<SCREEN_WIDTH_PIXELS) && (y<SCREEN_HEIGHT_LINES))
209211    {
r7235r7236
214216    }
215217}
216218
219static void set_pixel40(UINT16 x, UINT16 y, UINT8 colour)
220{
221    set_pixel((x*2),y,colour);
222    set_pixel((x*2)+1,y,colour);
223}
224
217225static void write_pixel_line(UINT16 x, UINT16 y, UINT16    data, UINT8 width)
218226{
219227    UINT16  mask;
r7235r7236
236244        //logerror("write_pixel_line: data=%04X, mask=%04X, shifts=%02X, bpp=%02X colour=%02X\n",data,mask,shifts,bpp,colour);
237245       
238246        if(IS_80COL)
239        {
240247            set_pixel(pixel_x,y,colour);
241        }
242248        else
243        {
244            set_pixel((pixel_x*2),y,colour);
245            set_pixel((pixel_x*2)+1,y,colour);
246        }
249            set_pixel40(pixel_x,y,colour);
250
247251        shifts-=bpp;
248252    }
249253}
r7235r7236
306310                          break;
307311                     
308312            case 0x02   : bpp=1; pixel_mask=0x0080;
309                          write_pixel_line(x,y,data,8); break;
313                          write_pixel_line(x,y,data,8);
314                          break;
310315       
311316            case 0x03   : bpp=1;
312317                          set_pixel(x,y,FG_COLOUR);
r7235r7236
316321                          write_pixel_line(x,y,((data & 0xFF) & ((data & 0xFF00)>>8)),8);
317322                          break;
318323       
319            case 0x05   : move_pixel_line(x,y,data,8);
324            case 0x05   : move_pixel_line(x,y,data,16);
320325                          break;
321326       
322327            case 0x06   : bpp=2; pixel_mask=0xC000;
r7235r7236
328333                          break;   
329334        }
330335    }
331    else
336    else /* 40 Col */
332337    {
333338        switch (vidregs[reg022] & WIDTH_MASK)
334339        {
r7235r7236
341346                          break;
342347                     
343348            case 0x02   : bpp=1; pixel_mask=0x0080;
344                          write_pixel_line(x,y,data,8); break;
349                          set_pixel40(x,y,FG_COLOUR);
350                          break;
345351       
346352            case 0x03   : bpp=1;
347353                          set_pixel(x,y,FG_COLOUR);
r7235r7236
381387    // I dunno if this is actually what is happening as the regs seem to be write only....
382388    // doing this however does seem to make some programs (worms from the welcom disk)
383389    // work correctly.
384    if(IS_80COL)
385        vidregs[reg002]=vidregs[reg012];
386    else
387        vidregs[reg002]=vidregs[reg012]/2;
390    vidregs[reg002]=vidregs[reg012];
388391
389392    write_pixel_data(vidregs[reg012],vidregs[reg00C],FG_COLOUR);
390393}
r7235r7236
399402    write_pixel_data(++vidregs[reg002],vidregs[reg00C],vidregs[reg01A]); 
400403}
401404
402static void write_reg_01C()
405static void write_reg_01C(void)
403406{
404407    // I dunno if this is actually what is happening as the regs seem to be write only....
405408    // doing this however does seem to make some programs (welcome from the welcom disk,
406    // and others using the standard RM box menus) work correctly.
407   
408    if(IS_80COL)
409        vidregs[reg00C]=vidregs[reg01C];
410    else
411        vidregs[reg00C]=vidregs[reg01C]/2;
409    // and others using the standard RM box menus) work correctly.   
410    vidregs[reg00C]=vidregs[reg01C];
412411
413412    write_pixel_data(vidregs[reg002],vidregs[reg01C],FG_COLOUR);
414413}
r7235r7236
432431    UINT16  mask;
433432    UINT8   shifts;
434433    UINT8   paletteidx;
434    UINT8   colourmax;
435435   
436    shifts=12;
437    mask=0xF000;
438    for(colourno=first; colourno<SCREEN_NO_COLOURS; colourno+=4)
436    shifts=0;
437    mask=0x000F;
438   
439    colourmax=IS_80COL ? 1 : 4;
440   
441    for(colourno=first; colourno<(first+4); colourno++)
439442    {
440443        paletteidx=(colours & mask) >> shifts;
441444        palette_set_color_rgb(machine, colourno, nimbus_palette[paletteidx][RED], nimbus_palette[paletteidx][GREEN], nimbus_palette[paletteidx][BLUE]);
442        mask=mask>>4;
443        shifts-=4;
445       
446        if(debug_on & DEBUG_TEXT)
447            logerror("set colourno[%02X](r,g,b)=(%02X,%02X,%02X), paletteidx=%02X\n",colourno, nimbus_palette[paletteidx][RED], nimbus_palette[paletteidx][GREEN], nimbus_palette[paletteidx][BLUE],paletteidx);
448        mask=mask<<4;
449        shifts+=4;
444450    }
445451}
446452
r7235r7236
462468    int regno;
463469   
464470    for(regno=0;regno<0x08;regno++)
471    {
465472        debug_console_printf(machine,"reg%03X=%04X reg%03X=%04X reg%03X=%04X\n",
466473                regno*2,vidregs[regno],
467474                (regno+0x08)*2,vidregs[regno+0x08],
468475                (regno+0x10)*2,vidregs[regno+0x10]);
476
477        logerror("reg%03X=%04X reg%03X=%04X reg%03X=%04X\n",
478                regno*2,vidregs[regno],
479                (regno+0x08)*2,vidregs[regno+0x08],
480                (regno+0x10)*2,vidregs[regno+0x10]);
481    }
469482}
470483
471484VIDEO_START( nimbus )
src/mess/includes/rmnimbus.h
r7235r7236
9696
9797/* SASI harddisk interface */
9898#define HARDDISK0_TAG           "harddisk0"
99#define HARDDISK1_TAG           "harddisk1"
100#define HARDDISK2_TAG           "harddisk2"
101#define HARDDISK3_TAG           "harddisk3"
102
99103#define SCSIBUS_TAG             "scsibus"
100104
101105void nimbus_scsi_linechange(running_device *device, UINT8 line, UINT8 state);
src/mess/drivers/rmnimbus.c
r7235r7236
8080
8181static const SCSIConfigTable nimbus_scsi_dev_table =
8282{
83   1,                                      /* 1 SCSI device */
83   4,                                      /* 4 SCSI devices */
8484   {
8585      { SCSI_ID_0, HARDDISK0_TAG, SCSI_DEVICE_HARDDISK },
86      { SCSI_ID_1, HARDDISK1_TAG, SCSI_DEVICE_HARDDISK },
87      { SCSI_ID_2, HARDDISK2_TAG, SCSI_DEVICE_HARDDISK },
88      { SCSI_ID_3, HARDDISK3_TAG, SCSI_DEVICE_HARDDISK },
8689   }
8790};
8891
r7235r7236
291294   MDRV_FLOPPY_4_DRIVES_ADD(nimbus_floppy_config)
292295   
293296    MDRV_HARDDISK_ADD(HARDDISK0_TAG)
297    MDRV_HARDDISK_ADD(HARDDISK1_TAG)
298    MDRV_HARDDISK_ADD(HARDDISK2_TAG)
299    MDRV_HARDDISK_ADD(HARDDISK3_TAG)
294300    MDRV_SCSIBUS_ADD(SCSIBUS_TAG, scsibus_config)
295301   
296302    MDRV_RAM_ADD("messram")

Previous 15994 Revisions Next


© 1998-2018 The MESS Team