Previous 15994 Revisions Next

r4427 Saturday 21st March, 2009 at 06:02:53 UTC by Robbbert
[ELECTRON] Fixed graphics modes (0,1,2,4,5), broken somewhere in the 128-129 cycle.
[src/mess/video]electron.c

src/mess/video/electron.c
r4426r4427
7171   r.min_y = r.max_y = scanline;
7272
7373   /* set up palette */
74   switch( electron_ula.screen_mode ) {
74   switch( electron_ula.screen_mode )
75   {
7576   case 0: case 3: case 4: case 6: case 7: /* 2 colour mode */
7677      pal[0] = electron_ula.current_pal[0];
7778      pal[1] = electron_ula.current_pal[8];
r4426r4427
8384      pal[3] = electron_ula.current_pal[10];
8485      break;
8586   case 2:   /* 16 colour mode */
86      for( i = 0; i < 16; i++ ) {
87      for( i = 0; i < 16; i++ )
8788         pal[i] = electron_ula.current_pal[i];
88      }
89      break;
9089   }
90
9191   /* draw line */
92   switch( electron_ula.screen_mode ) {
92   switch( electron_ula.screen_mode )
93   {
9394   case 0:
94      for( i = 0; i < 80; i++ ) {
95         UINT8 pattern = read_vram( electron_ula.screen_addr + i * 8 );
95      for( i = 0; i < 80; i++ )
96      {
97         UINT8 pattern = read_vram( electron_ula.screen_addr + (i << 3) );
9698         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>7)& 1] );
9799         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>6)& 1] );
98100         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>5)& 1] );
r4426r4427
102104         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>1)& 1] );
103105         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>0)& 1] );
104106      }
105      electron_ula.screen_addr += 1;
106      if ( ( scanline & 0x07 ) == 7 ) {
107         electron_ula.screen_addr += ( 0x280 - 8 );
108      }
107      electron_ula.screen_addr++;
108      if ( ( scanline & 0x07 ) == 7 )
109         electron_ula.screen_addr += 0x278;
109110      break;
111
110112   case 1:
111      x = 0;
112      for( i = 0; i < 80; i++ ) {
113      for( i = 0; i < 80; i++ )
114      {
113115         UINT8 pattern = read_vram( electron_ula.screen_addr + i * 8 );
114116         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>3]] );
115117         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>3]] );
r4426r4427
120122         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>0]] );
121123         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>0]] );
122124      }
123      electron_ula.screen_addr += 1;
124      if ( ( scanline & 0x07 ) == 7 ) {
125         electron_ula.screen_addr += ( 0x280 - 8 );
126      }
125      electron_ula.screen_addr++;
126      if ( ( scanline & 0x07 ) == 7 )
127         electron_ula.screen_addr += 0x278;
127128      break;
129
128130   case 2:
129      for( i = 0; i < 80; i++ ) {
131      for( i = 0; i < 80; i++ )
132      {
130133         UINT8 pattern = read_vram( electron_ula.screen_addr + i * 8 );
131134         electron_plot_pixel( bitmap, x++, scanline, pal[map16[pattern>>1]] );
132135         electron_plot_pixel( bitmap, x++, scanline, pal[map16[pattern>>1]] );
r4426r4427
137140         electron_plot_pixel( bitmap, x++, scanline, pal[map16[pattern>>0]] );
138141         electron_plot_pixel( bitmap, x++, scanline, pal[map16[pattern>>0]] );
139142      }
140      electron_ula.screen_addr += 1;
141      if ( ( scanline & 0x07 ) == 7 ) {
142         electron_ula.screen_addr += ( 0x280 - 8 );
143      }
143      electron_ula.screen_addr++;
144      if ( ( scanline & 0x07 ) == 7 )
145         electron_ula.screen_addr += 0x278;
144146      break;
147
145148   case 3:
146149      if ( ( scanline > 249 ) || ( scanline % 10 >= 8 ) )
147150         bitmap_fill( bitmap, &r , 7);
r4426r4427
159162            electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>1)&1] );
160163            electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>0)&1] );
161164         }
162         electron_ula.screen_addr += 1;
165         electron_ula.screen_addr++;
163166      }
167      if ( scanline % 10 == 9 )
168         electron_ula.screen_addr += 0x278;
169      break;
164170
165      if ( scanline % 10 == 9 ) electron_ula.screen_addr += ( 0x280 - 8 );
166      break;
167171   case 4:
168172   case 7:
169      for( i = 0; i < 40; i++ ) {
173      for( i = 0; i < 40; i++ )
174      {
170175         UINT8 pattern = read_vram( electron_ula.screen_addr + i * 8 );
171176         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>7)&1] );
172177         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>7)&1] );
r4426r4427
185190         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>0)&1] );
186191         electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>0)&1] );
187192      }
188      electron_ula.screen_addr += 1;
189      if ( ( scanline & 0x07 ) == 7 ) {
190         electron_ula.screen_addr += ( 0x140 - 8 );
191      }
193      electron_ula.screen_addr++;
194      if ( ( scanline & 0x07 ) == 7 )
195         electron_ula.screen_addr += 0x138;
192196      break;
197
193198   case 5:
194      for( i = 0; i < 40; i++ ) {
199      for( i = 0; i < 40; i++ )
200      {
195201         UINT8 pattern = read_vram( electron_ula.screen_addr + i * 8 );
196202         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>3]] );
197203         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>3]] );
r4426r4427
210216         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>0]] );
211217         electron_plot_pixel( bitmap, x++, scanline, pal[map4[pattern>>0]] );
212218      }
213      electron_ula.screen_addr += 1;
214      if ( ( scanline & 0x07 ) == 7 ) {
215         electron_ula.screen_addr += ( 0x140 - 8 );
216      }
219      electron_ula.screen_addr++;
220      if ( ( scanline & 0x07 ) == 7 )
221         electron_ula.screen_addr += 0x138;
217222      break;
223
218224   case 6:
219      if ( ( scanline > 249 ) || ( scanline % 10 >= 8 ) ) {
225      if ( ( scanline > 249 ) || ( scanline % 10 >= 8 ) )
220226         bitmap_fill( bitmap, &r , 7);
221      } else {
222         for( i = 0; i < 40; i++ ) {
227      else
228      {
229         for( i = 0; i < 40; i++ )
230         {
223231            UINT8 pattern = read_vram( electron_ula.screen_addr + i * 8 );
224232            electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>7)&1] );
225233            electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>7)&1] );
r4426r4427
238246            electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>0)&1] );
239247            electron_plot_pixel( bitmap, x++, scanline, pal[(pattern>>0)&1] );
240248         }
241         electron_ula.screen_addr += 1;
242         if ( ( scanline % 10 ) == 7 ) {
243            electron_ula.screen_addr += ( 0x140 - 8 );
244         }
249         electron_ula.screen_addr++;
250         if ( ( scanline % 10 ) == 7 )
251            electron_ula.screen_addr += 0x138;
245252      }
246253      break;
247254   }
r4426r4427
259266   case 199:
260267      electron_interrupt_handler( machine, INT_SET, INT_DISPLAY_END );
261268      break;
262   case 255:
269   case 0:
263270      electron_ula.screen_addr = electron_ula.screen_start - electron_ula.screen_base;
264271      break;
265272   }

Previous 15994 Revisions Next


© 1998-2018 The MESS Team