--- hatari/src/falcon/videl.c 2019/04/01 07:13:46 1.1 +++ hatari/src/falcon/videl.c 2019/04/09 08:52:09 1.1.1.8 @@ -11,106 +11,622 @@ This file originally came from the Aranym project and has been heavily modified to work for Hatari (but the kudos for the great Videl emulation code goes to the people from the Aranym project of course). + + Videl can run at 2 frequencies : 25.175 Mhz or 32 MHz + + Hardware I/O registers: + + $FFFF8006 (byte) : monitor type + + $FFFF8201 (byte) : VDL_VBH - Video Base Hi + $FFFF8203 (byte) : VDL_VBM - Video Base Mi + $FFFF8205 (byte) : VDL_VCH - Video Count Hi + $FFFF8207 (byte) : VDL_VCM - Video Count Mi + $FFFF8209 (byte) : VDL_VCL - Video Count Lo + $FFFF820A (byte) : VDL_SYM - Sync mode + $FFFF820D (byte) : VDL_VBL - Video Base Lo + $FFFF820E (word) : VDL_LOF - Offset to next line + $FFFF8210 (word) : VDL_LWD - Line Wide in Words + + $FFFF8240 (word) : VDL_STC - ST Palette Register 00 + ......... + $FFFF825E (word) : VDL_STC - ST Palette Register 15 + + $FFFF8260 (byte) : ST shift mode + $FFFF8264 (byte) : Horizontal scroll register shadow register + $FFFF8265 (byte) : Horizontal scroll register + $FFFF8266 (word) : Falcon shift mode + + $FFFF8280 (word) : HHC - Horizontal Hold Counter + $FFFF8282 (word) : HHT - Horizontal Hold Timer + $FFFF8284 (word) : HBB - Horizontal Border Begin + $FFFF8286 (word) : HBE - Horizontal Border End + $FFFF8288 (word) : HDB - Horizontal Display Begin + $FFFF828A (word) : HDE - Horizontal Display End + $FFFF828C (word) : HSS - Horizontal SS + $FFFF828E (word) : HFS - Horizontal FS + $FFFF8290 (word) : HEE - Horizontal EE + + $FFFF82A0 (word) : VFC - Vertical Frequency Counter + $FFFF82A2 (word) : VFT - Vertical Frequency Timer + $FFFF82A4 (word) : VBB - Vertical Border Begin + $FFFF82A6 (word) : VBE - Vertical Border End + $FFFF82A8 (word) : VDB - Vertical Display Begin + $FFFF82AA (word) : VDE - Vertical Display End + $FFFF82AC (word) : VSS - Vertical SS + + $FFFF82C0 (word) : VCO - Video control + $FFFF82C2 (word) : VMD - Video mode + + $FFFF9800 (long) : VDL_PAL - Videl palette Register 000 + ........... + $FFFF98FC (long) : VDL_PAL - Videl palette Register 255 */ -const char VIDEL_rcsid[] = "Hatari $Id: videl.c,v 1.1 2019/04/01 07:13:46 root Exp $"; +const char VIDEL_fileid[] = "Hatari videl.c : " __DATE__ " " __TIME__; + +#include +#include #include "main.h" #include "configuration.h" +#include "memorySnapShot.h" #include "ioMem.h" +#include "log.h" #include "hostscreen.h" #include "screen.h" #include "stMemory.h" -#include "video.h" #include "videl.h" -#include -#define handleRead(a) IoMem_ReadByte(a) -#define handleReadW(a) IoMem_ReadWord(a) #define Atari2HostAddr(a) (&STRam[a]) +#define VIDEL_COLOR_REGS_BEGIN 0xff9800 -#define VIDEL_DEBUG 0 -#if VIDEL_DEBUG -#define Dprintf(a) printf a -#else -#define Dprintf(a) -#endif +struct videl_s { + bool bUseSTShifter; /* whether to use ST or Falcon palette */ + Uint8 reg_ffff8006_save; /* save reg_ffff8006 as it's a read only register */ + Uint8 monitor_type; /* 00 Monochrome (SM124) / 01 Color (SC1224) / 10 VGA Color / 11 Television ($FFFF8006) */ + Uint32 videoBaseAddr; /* Video base address, refreshed after each VBL */ + + Sint16 leftBorderSize; /* Size of the left border */ + Sint16 rightBorderSize; /* Size of the right border */ + Sint16 upperBorderSize; /* Size of the upper border */ + Sint16 lowerBorderSize; /* Size of the lower border */ + Uint16 XSize; /* X size of the graphical area */ + Uint16 YSize; /* Y size of the graphical area */ + + Uint16 save_scrWidth; /* save screen width to detect a change of X resolution */ + Uint16 save_scrHeight; /* save screen height to detect a change of Y resolution */ + Uint16 save_scrBpp; /* save screen Bpp to detect a change of bitplan mode */ + + bool hostColorsSync; /* Sync palette with host's */ +}; + +struct videl_zoom_s { + Uint16 zoomwidth; + Uint16 prev_scrwidth; + Uint16 zoomheight; + Uint16 prev_scrheight; + int *zoomxtable; + int *zoomytable; +}; + +static struct videl_s videl; +static struct videl_zoom_s videl_zoom; + +Uint16 vfc_counter; /* counter for VFC register $ff82a0 (to be internalized when VIDEL emulation is complete) */ + +static void VIDEL_memset_uint32(Uint32 *addr, Uint32 color, int count); +static void VIDEL_memset_uint16(Uint16 *addr, Uint16 color, int count); +static void VIDEL_memset_uint8(Uint8 *addr, Uint8 color, int count); -#define HW 0xff8200 -#define VIDEL_COLOR_REGS_BEGIN 0xff9800 -#define VIDEL_COLOR_REGS_END 0xffa200 +/** + * Called upon startup and when CPU encounters a RESET instruction. + */ +void VIDEL_reset(void) +{ + videl.bUseSTShifter = false; /* Use Falcon color palette by default */ + videl.reg_ffff8006_save = IoMem_ReadByte(0xff8006); + videl.monitor_type = videl.reg_ffff8006_save & 0xc0; + + videl.hostColorsSync = false; + vfc_counter = 0; + + /* Autozoom */ + videl_zoom.zoomwidth = 0; + videl_zoom.prev_scrwidth = 0; + videl_zoom.zoomheight = 0; + videl_zoom.prev_scrheight = 0; + videl_zoom.zoomxtable = NULL; + videl_zoom.zoomytable = NULL; + + /* Default resolution to boot with */ + videl.save_scrWidth = 640; + videl.save_scrHeight = 480; + videl.save_scrBpp = ConfigureParams.Screen.nForceBpp; + HostScreen_setWindowSize(videl.save_scrWidth, videl.save_scrHeight, videl.save_scrBpp); + + /* Reset IO register (some are not initialized by TOS) */ + IoMem_WriteWord(0xff820e, 0); /* Line offset */ + IoMem_WriteWord(0xff8264, 0); /* Horizontal scroll */ -static int width, height, bpp, since_last_change; -static BOOL hostColorsSync; + /* Init synch mode register */ + VIDEL_SyncMode_WriteByte(); +} -/* Autozoom */ -static int zoomwidth, prev_scrwidth; -static int zoomheight, prev_scrheight; -static int *zoomxtable; -static int *zoomytable; +/** + * Save/Restore snapshot of local variables ('MemorySnapShot_Store' handles type) + */ +void VIDEL_MemorySnapShot_Capture(bool bSave) +{ + /* Save/Restore details */ + MemorySnapShot_Store(&videl, sizeof(videl)); + MemorySnapShot_Store(&videl_zoom, sizeof(videl_zoom)); + MemorySnapShot_Store(&vfc_counter, sizeof(vfc_counter)); +} -static void VIDEL_renderScreenNoZoom(void); -static void VIDEL_renderScreenZoom(void); +/** + * Monitor write access to ST/E color palette registers + */ +void VIDEL_ColorRegsWrite(void) +{ + videl.hostColorsSync = false; +} +/** + * VIDEL_Monitor_WriteByte : Contains memory and monitor configuration. + * This register is read only. + */ +void VIDEL_Monitor_WriteByte(void) +{ + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8006 Monitor and memory conf write (Read only)\n"); + /* Restore hardware value */ -// Called upon startup and when CPU encounters a RESET instruction. -void VIDEL_reset(void) + IoMem_WriteByte(0xff8006, videl.reg_ffff8006_save); +} + +/** + * VIDEL_SyncMode_WriteByte : Videl synchronization mode. + * $FFFF820A [R/W] _______0 .................................. SYNC-MODE + || + |+--Synchronisation [ 0:internal / 1:external ] + +---Vertical frequency [ Read-only bit ] + [ Monochrome monitor:0 / Colour monitor:1 ] + */ +void VIDEL_SyncMode_WriteByte(void) { - since_last_change = 0; + Uint8 syncMode = IoMem_ReadByte(0xff820a); + LOG_TRACE(TRACE_VIDEL, "Videl : $ff820a Sync Mode write: 0x%02x\n", syncMode); - hostColorsSync = FALSE; + if (videl.monitor_type == FALCON_MONITOR_MONO) + syncMode &= 0xfd; + else + syncMode |= 0x2; + + IoMem_WriteByte(0xff820a, syncMode); +} - /* Autozoom */ - zoomwidth=prev_scrwidth=0; - zoomheight=prev_scrheight=0; - zoomxtable=NULL; - zoomytable=NULL; - - // default resolution to boot with - width = 640; - height = 480; - HostScreen_setWindowSize( width, height, 8 ); +/** + * Read video address counter and update ff8205/07/09 + */ +void VIDEL_ScreenCounter_ReadByte(void) +{ +// Uint32 addr; // To be used + Uint32 addr = 0; // To be removed + + // addr = Videl_CalculateAddress(); /* TODO: get current video address */ + IoMem[0xff8205] = ( addr >> 16 ) & 0xff; + IoMem[0xff8207] = ( addr >> 8 ) & 0xff; + IoMem[0xff8209] = addr & 0xff; + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8205/07/09 Sync Mode read: 0x%08x\n", addr); } -// monitor write access to Falcon and ST/E color palette registers -void VIDEL_ColorRegsWrite(void) +/** + * Write video address counter + */ +void VIDEL_ScreenCounter_WriteByte(void) +{ + Uint32 addr_new = 0; + Uint8 AddrByte; + + AddrByte = IoMem[ IoAccessCurrentAddress ]; + + /* Compute the new video address with one modified byte */ + if ( IoAccessCurrentAddress == 0xff8205 ) + addr_new = ( addr_new & 0x00ffff ) | ( AddrByte << 16 ); + else if ( IoAccessCurrentAddress == 0xff8207 ) + addr_new = ( addr_new & 0xff00ff ) | ( AddrByte << 8 ); + else if ( IoAccessCurrentAddress == 0xff8209 ) + addr_new = ( addr_new & 0xffff00 ) | ( AddrByte ); + + // TODO: save the value in a table for the final rendering +} + +/** + * VIDEL_LineOffset_WriteWord: $FFFF820E [R/W] W _______876543210 Line Offset + * How many words are added to the end of display line, i.e. how many words are + * 'behind' the display. + */ +void VIDEL_LineOffset_WriteWord(void) +{ + Uint16 lineOffset = IoMem_ReadWord(0xff820e); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff820e Line Offset write: 0x%04x\n", lineOffset); +} + +/** + * VIDEL_Line_Width_WriteWord: $FFFF8210 [R/W] W ______9876543210 Line Width (VWRAP) + * Length of display line in words.Or, how many words should be added to + * vram counter after every display line. + */ +void VIDEL_Line_Width_WriteWord(void) { - hostColorsSync = FALSE; + Uint16 lineWidth = IoMem_ReadWord(0xff8210); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8210 Line Width write: 0x%04x\n", lineWidth); } -void VIDEL_ShiftModeWriteWord(void) +/** + * Write to video address base high, med and low register (0xff8201/03/0d). + * On Falcon, when a program writes to high or med registers, base low register + * is reset to zero. + */ +void VIDEL_ScreenBase_WriteByte(void) { - Dprintf(("VIDEL f_shift: %06x = 0x%x\n", IoAccessBaseAddress, handleReadW(HW+0x66))); - bUseSTShifter = FALSE; + Uint32 screenBase; + + if ((IoAccessCurrentAddress == 0xff8201) || (IoAccessCurrentAddress == 0xff8203)) { + /* Reset screen base low register */ + IoMem[0xff820d] = 0; + } + + screenBase = (IoMem[0xff8201]<<16)+(IoMem[0xff8203]<<8)+IoMem[0xff820d]; + + LOG_TRACE(TRACE_VIDEL, "Videl : $%04x Screen base write: 0x%02x\t (screen: 0x%04x)\n", + IoAccessCurrentAddress, IoMem[IoAccessCurrentAddress], screenBase); } -static long VIDEL_getVideoramAddress(void) +/** + VIDEL_ST_ShiftModeWriteByte : + $FFFF8260 [R/W] B ______10 ST Shift Mode + || + || others vga + || $FF8210 $FF82C2 $FF82C2 + 00--4BP/320 Pixels=> $0050 $0000 $0005 + 01--2BP/640 Pixels=> $0050 $0004 $0009 + 10--1BP/640 Pixels=> $0028 $0006 $0008 + 11--???/320 Pixels=> $0050 $0000 $0000 + + Writing to this register does the following things: + - activate STE palette + - sets line width ($ffff8210) + - sets video mode in $ffff82c2 (double lines/interlace & cycles/pixel) + */ +void VIDEL_ST_ShiftModeWriteByte(void) { - return (handleRead(HW + 1) << 16) | (handleRead(HW + 3) << 8) | handleRead(HW + 0x0d); + Uint16 line_width, video_mode; + Uint8 st_shiftMode; + + st_shiftMode = IoMem_ReadByte(0xff8260); + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8260 ST Shift Mode (STSHIFT) write: 0x%02x\n", st_shiftMode); + + /* Bits 2-7 are set to 0 */ + IoMem_WriteByte(0xff8260, st_shiftMode & 3); + + /* Activate STE palette */ + videl.bUseSTShifter = true; + + /* Compute line width and video mode */ + switch (st_shiftMode & 0x3) { + case 0: /* 4BP/320 Pixels */ + line_width = 0x50; + /* half pixels + double lines vs. no scaling */ + video_mode = videl.monitor_type == FALCON_MONITOR_VGA ? 0x5 : 0x0; + break; + case 1: /* 2BP/640 Pixels */ + line_width = 0x50; + /* quarter pixels + double lines vs. half pixels */ + video_mode = videl.monitor_type == FALCON_MONITOR_VGA ? 0x9 : 0x4; + break; + case 2: /* 1BP/640 Pixels */ + line_width = 0x28; + if (videl.monitor_type == FALCON_MONITOR_MONO) { + video_mode = 0x0; + break; + } + /* quarter pixels vs. half pixels + interlace */ + video_mode = videl.monitor_type == FALCON_MONITOR_VGA ? 0x8 : 0x6; + break; + case 3: /* ???/320 Pixels */ + default: + line_width = 0x50; + video_mode = 0x0; + break; + } + + /* Set line width ($FFFF8210) */ + IoMem_WriteWord(0xff8210, line_width); + + /* Set video mode ($FFFF82C2) */ + IoMem_WriteWord(0xff82c2, video_mode); } -static int VIDEL_getScreenBpp(void) +/** + VIDEL_HorScroll64_WriteByte : Horizontal scroll register (0-15) + $FFFF8264 [R/W] ________ ................................ H-SCROLL HI + |||| [ Shadow register for $FFFF8265 ] + ++++--Pixel shift [ 0:normal / 1..15:Left shift ] + [ Change in line-width NOT required ] + */ +void VIDEL_HorScroll64_WriteByte(void) { - int f_shift = handleReadW(HW + 0x66); - int st_shift = handleRead(HW + 0x60); + Uint8 horScroll64 = IoMem_ReadWord(0xff8264); + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8264 Horizontal scroll 64 write: 0x%02x\n", horScroll64); +} + +/** + VIDEL_HorScroll65_WriteByte : Horizontal scroll register (0-15) + $FFFF8265 [R/W] ____3210 .................................H-SCROLL LO + |||| + ++++--Pixel [ 0:normal / 1..15:Left shift ] + [ Change in line-width NOT required ] + */ +void VIDEL_HorScroll65_WriteByte(void) +{ + Uint8 horScroll65 = IoMem_ReadWord(0xff8265); + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8265 Horizontal scroll 65 write: 0x%02x\n", horScroll65); +} + +/** + VIDEL_Falcon_ShiftMode_WriteWord : + $FFFF8266 [R/W] W _____A98_6543210 Falcon Shift Mode (SPSHIFT) + ||| ||||||| + ||| |||++++- 0..15: Colourbank choice from 256-colour table in 16 colour multiples + ||| ||+----- 8 Bitplanes mode (256 Colors) [0:off / 1:on] + ||| |+------ Vertical Sync [0: internal / 1: external] + ||| +------- Horizontal Sync [0: internal / 1: external] + ||+--------- True-Color-Mode [0:off / 1:on] + |+---------- Overlay-Mode [0:off / 1:on] + +----------- 0: 2-Color-Mode [0:off / 1:on] + + Writing to this register does the following things: + - activate Falcon palette + - if you set Bits A/8/4 == 0, it selects 16-Color-Falcon-Mode (NOT the + same as ST LOW since Falcon palette is used!) + - $8260 register is ignored, you don't need to write here anything + + Note: 4-Color-Mode isn't realisable with Falcon palette. + */ +void VIDEL_Falcon_ShiftMode_WriteWord(void) +{ + Uint16 falc_shiftMode = IoMem_ReadWord(0xff8266); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8266 Falcon Shift Mode (SPSHIFT) write: 0x%04x\n", falc_shiftMode); + + videl.bUseSTShifter = false; +} + +/** + * Write Horizontal Hold Counter (HHC) + */ +void VIDEL_HHC_WriteWord(void) +{ + Uint16 hhc = IoMem_ReadWord(0xff8280); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8280 Horizontal Hold Counter (HHC) write: 0x%04x\n", hhc); +} + +/** + * Write Horizontal Hold Timer (HHT) + */ +void VIDEL_HHT_WriteWord(void) +{ + Uint16 hht = IoMem_ReadWord(0xff8282); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8282 Horizontal Hold Timer (HHT) write: 0x%04x\n", hht); +} + +/** + * Write Horizontal Border Begin (HBB) + */ +void VIDEL_HBB_WriteWord(void) +{ + Uint16 hbb = IoMem_ReadWord(0xff8284); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8284 Horizontal Border Begin (HBB) write: 0x%04x\n", hbb); +} + +/** + * Write Horizontal Border End (HBE) + */ +void VIDEL_HBE_WriteWord(void) +{ + Uint16 hbe = IoMem_ReadWord(0xff8286); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8286 Horizontal Border End (HBE) write: 0x%04x\n", hbe); +} + +/** + * Write Horizontal Display Begin (HDB) + $FFFF8288 [R/W] W ______9876543210 Horizontal Display Begin (HDB) + | + +---------- Display will start in [0: 1st halfline / 1: 2nd halfline] + */ +void VIDEL_HDB_WriteWord(void) +{ + Uint16 hdb = IoMem_ReadWord(0xff8288); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8288 Horizontal Display Begin (HDB) write: 0x%04x\n", hdb); +} + +/** + * Write Horizontal Display End (HDE) + */ +void VIDEL_HDE_WriteWord(void) +{ + Uint16 hde = IoMem_ReadWord(0xff828a); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff828a Horizontal Display End (HDE) write: 0x%04x\n", hde); +} + +/** + * Write Horizontal SS (HSS) + */ +void VIDEL_HSS_WriteWord(void) +{ + Uint16 hss = IoMem_ReadWord(0xff828c); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff828c Horizontal SS (HSS) write: 0x%04x\n", hss); +} + +/** + * Write Horizontal FS (HFS) + */ +void VIDEL_HFS_WriteWord(void) +{ + Uint16 hfs = IoMem_ReadWord(0xff828e); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff828e Horizontal FS (HFS) write: 0x%04x\n", hfs); +} + +/** + * Write Horizontal EE (HEE) + */ +void VIDEL_HEE_WriteWord(void) +{ + Uint16 hee = IoMem_ReadWord(0xff8290); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff8290 Horizontal EE (HEE) write: 0x%04x\n", hee); +} + +/** + * Write Vertical Frequency Counter (VFC) + */ +void VIDEL_VFC_ReadWord(void) +{ + IoMem_WriteWord(0xff82a0, vfc_counter); + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82a0 Vertical Frequency Counter (VFC) read: 0x%04x\n", vfc_counter); +} + +/** + * Write Vertical Frequency Timer (VFT) + */ +void VIDEL_VFT_WriteWord(void) +{ + Uint16 vft = IoMem_ReadWord(0xff82a2); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82a2 Vertical Frequency Timer (VFT) write: 0x%04x\n", vft); +} + +/** + * Write Vertical Border Begin (VBB) + */ +void VIDEL_VBB_WriteWord(void) +{ + Uint16 vbb = IoMem_ReadWord(0xff82a4); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82a4 Vertical Border Begin (VBB) write: 0x%04x\n", vbb); +} + +/** + * Write Vertical Border End (VBE) + */ +void VIDEL_VBE_WriteWord(void) +{ + Uint16 vbe = IoMem_ReadWord(0xff82a6); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82a6 Vertical Border End (VBE) write: 0x%04x\n", vbe); +} + +/** + * Write Vertical Display Begin (VDB) + */ +void VIDEL_VDB_WriteWord(void) +{ + Uint16 vdb = IoMem_ReadWord(0xff82a8); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82a8 Vertical Display Begin (VDB) write: 0x%04x\n", vdb); +} + +/** + * Write Vertical Display End (VDE) + */ +void VIDEL_VDE_WriteWord(void) +{ + Uint16 vde = IoMem_ReadWord(0xff82aa); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82aa Vertical Display End (VDE) write: 0x%04x\n", vde); +} + +/** + * Write Vertical SS (VSS) + */ +void VIDEL_VSS_WriteWord(void) +{ + Uint16 vss = IoMem_ReadWord(0xff82ac); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82ac Vertical SS (VSS) write: 0x%04x\n", vss); +} + +/** + * Write Video Control (VCO) + */ +void VIDEL_VCO_WriteWord(void) +{ + Uint16 vco = IoMem_ReadWord(0xff82c0); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82c0 Video control (VCO) write: 0x%04x\n", vco); +} + +/** + * Write Video Mode (VDM) + */ +void VIDEL_VMD_WriteWord(void) +{ + Uint16 vdm = IoMem_ReadWord(0xff82c2); + + LOG_TRACE(TRACE_VIDEL, "Videl : $ff82c2 Video Mode (VDM) write: 0x%04x\n", vdm); +} + + +/** + * VIDEL_getVideoramAddress: returns the video RAM address. + * On Falcon, video address must be a multiple of four in bitplane modes. + */ +static Uint32 VIDEL_getVideoramAddress(void) +{ + Uint32 videoBase; + + videoBase = (Uint32) IoMem_ReadByte(0xff8201) << 16; + videoBase |= (Uint32) IoMem_ReadByte(0xff8203) << 8; + videoBase |= IoMem_ReadByte(0xff820d) & ~3; + + return videoBase; +} + +static Uint16 VIDEL_getScreenBpp(void) +{ + Uint16 f_shift = IoMem_ReadWord(0xff8266); + Uint16 bits_per_pixel; + Uint8 st_shift = IoMem_ReadByte(0xff8260); + /* to get bpp, we must examine f_shift and st_shift. - * f_shift is valid if any of bits no. 10, 8 or 4 - * is set. Priority in f_shift is: 10 ">" 8 ">" 4, i.e. + * f_shift is valid if any of bits no. 10, 8 or 4 is set. + * Priority in f_shift is: 10 ">" 8 ">" 4, i.e. * if bit 10 set then bit 8 and bit 4 don't care... * If all these bits are 0 and ST shifter is written * after Falcon one, get display depth from st_shift * (as for ST and STE) */ - int bits_per_pixel; if (f_shift & 0x400) /* Falcon: 2 colors */ bits_per_pixel = 1; else if (f_shift & 0x100) /* Falcon: hicolor */ bits_per_pixel = 16; else if (f_shift & 0x010) /* Falcon: 8 bitplanes */ bits_per_pixel = 8; - else if (!bUseSTShifter) /* Falcon: 4 bitplanes */ + else if (!videl.bUseSTShifter) /* Falcon: 4 bitplanes */ bits_per_pixel = 4; else if (st_shift == 0) bits_per_pixel = 4; @@ -119,49 +635,239 @@ static int VIDEL_getScreenBpp(void) else /* if (st_shift == 0x02) */ bits_per_pixel = 1; - // Dprintf(("Videl works in %d bpp, f_shift=%04x, st_shift=%d", bits_per_pixel, f_shift, st_shift)); +/* LOG_TRACE(TRACE_VIDEL, "Videl works in %d bpp, f_shift=%04x, st_shift=%d", bits_per_pixel, f_shift, st_shift); */ return bits_per_pixel; } +/** + * VIDEL_getScreenWidth : returns the visible X resolution + * left border + graphic area + right border + * left border : hdb - hbe-offset + * right border : hbb - hde-offset + * Graphics display : starts at cycle HDB and ends at cycle HDE. + */ static int VIDEL_getScreenWidth(void) { - return handleReadW(HW + 0x10) * 16 / VIDEL_getScreenBpp(); + Uint16 bpp = VIDEL_getScreenBpp(); + + /* X Size of the Display area */ + videl.XSize = (IoMem_ReadWord(0xff8210) & 0x03ff) * 16 / bpp; + + /* If the user disabled the borders display from the gui, we suppress them */ + if (ConfigureParams.Screen.bAllowOverscan == 0) { + videl.leftBorderSize = 0; + videl.rightBorderSize = 0; + return videl.XSize; + } + + /* According to Aura and Animal Mine doc about Videl, if a monochrome monitor is connected, + * HDB and HDE have no significance and no border is displayed. + */ + if (videl.monitor_type == FALCON_MONITOR_MONO) { + videl.leftBorderSize = 0; + videl.rightBorderSize = 0; + return videl.XSize; + } + + Uint16 hbb = IoMem_ReadWord(0xff8284) & 0x01ff; + Uint16 hbe = IoMem_ReadWord(0xff8286) & 0x01ff; + Uint16 hdb = IoMem_ReadWord(0xff8288) & 0x01ff; + Uint16 hde = IoMem_ReadWord(0xff828a) & 0x01ff; + Uint16 vdm = IoMem_ReadWord(0xff82c2) & 0xc; + Uint16 hht = IoMem_ReadWord(0xff8282) & 0x1ff; + + Uint16 cycPerPixel, divider; + Sint16 hdb_offset, hde_offset; + Sint16 leftBorder, rightBorder; + + /* Compute cycles per pixel */ + if (vdm == 0) + cycPerPixel = 4; + else if (vdm == 4) + cycPerPixel = 2; + else + cycPerPixel = 1; + + /* Compute the divider */ + if (videl.monitor_type == FALCON_MONITOR_VGA) { + if (cycPerPixel == 4) + divider = 4; + else + divider = 2; + } + else if (videl.bUseSTShifter == true) { + divider = 16; + } + else { + divider = cycPerPixel; + } + + /* Compute hdb_offset and hde_offset */ + if (videl.bUseSTShifter == false) { + if (bpp < 16) { + /* falcon mode bpp */ + hdb_offset = ((64+(128/bpp + 16 + 2) * cycPerPixel) / divider ) + 1; + hde_offset = ((128/bpp + 2) * cycPerPixel) / divider; + } + else { + /* falcon mode true color */ + hdb_offset = ((64 + 16 * cycPerPixel) / divider ) + 1; + hde_offset = 0; + } + } + else { + /* ST bitplan mode */ + hdb_offset = ((128+(128/bpp + 2) * cycPerPixel) / divider ) + 1; + hde_offset = ((128/bpp + 2) * cycPerPixel) / divider; + } + + LOG_TRACE(TRACE_VIDEL, "hdb_offset=%04x, hde_offset=%04x\n", hdb_offset, hde_offset); + + /* Compute left border size in cycles */ + if (IoMem_ReadWord(0xff8288) & 0x0200) + leftBorder = hdb - hbe + hdb_offset - hht - 2; + else + leftBorder = hdb - hbe + hdb_offset; + + /* Compute right border size in cycles */ + rightBorder = hbb - hde_offset - hde; + + videl.leftBorderSize = leftBorder / cycPerPixel; + videl.rightBorderSize = rightBorder / cycPerPixel; + LOG_TRACE(TRACE_VIDEL, "left border size=%04x, right border size=%04x\n", videl.leftBorderSize, videl.rightBorderSize); + + if (videl.leftBorderSize < 0) { +// fprintf(stderr, "BORDER LEFT < 0 %d\n", videl.leftBorderSize); + videl.leftBorderSize = 0; + } + if (videl.rightBorderSize < 0) { +// fprintf(stderr, "BORDER RIGHT < 0 %d\n", videl.rightBorderSize); + videl.rightBorderSize = 0; + } + + return videl.leftBorderSize + videl.XSize + videl.rightBorderSize; } +/** + * VIDEL_getScreenHeight : returns the visible Y resolution + * upper border + graphic area + lower border + * upper border : vdb - vbe + * lower border : vbb - vde + * Graphics display : starts at line VDB and ends at line VDE. + * If interlace mode off unit of VC-registers is half lines, else lines. + */ static int VIDEL_getScreenHeight(void) { - int vdb = handleReadW(HW + 0xa8); - int vde = handleReadW(HW + 0xaa); - int vmode = handleReadW(HW + 0xc2); - - /* visible y resolution: - * Graphics display starts at line VDB and ends at line - * VDE. If interlace mode off unit of VC-registers is - * half lines, else lines. + Uint16 vbb = IoMem_ReadWord(0xff82a4) & 0x07ff; + Uint16 vbe = IoMem_ReadWord(0xff82a6) & 0x07ff; + Uint16 vdb = IoMem_ReadWord(0xff82a8) & 0x07ff; + Uint16 vde = IoMem_ReadWord(0xff82aa) & 0x07ff; + Uint16 vmode = IoMem_ReadWord(0xff82c2); + + /* According to Aura and Animal Mine doc about Videl, if a monochrome monitor is connected, + * VDB and VDE have no significance and no border is displayed. + */ + if (videl.monitor_type == FALCON_MONITOR_MONO) { + videl.upperBorderSize = 0; + videl.lowerBorderSize = 0; + } + else { + /* We must take the positive value only, as a program like AceTracker starts the */ + /* graphical area 1 line before the end of the upper border */ + videl.upperBorderSize = vdb - vbe > 0 ? vdb - vbe : 0; + videl.lowerBorderSize = vbb - vde > 0 ? vbb - vde : 0; + } + + /* Y Size of the Display area */ + videl.YSize = vde - vdb; + + /* If the user disabled the borders display from the gui, we suppress them */ + if (ConfigureParams.Screen.bAllowOverscan == 0) { + videl.upperBorderSize = 0; + videl.lowerBorderSize = 0; + } + + if (!(vmode & 0x02)){ /* interlace */ + videl.YSize >>= 1; + videl.upperBorderSize >>= 1; + videl.lowerBorderSize >>= 1; + } + + if (vmode & 0x01) { /* double */ + videl.YSize >>= 1; + videl.upperBorderSize >>= 1; + videl.lowerBorderSize >>= 1; + } + + return videl.upperBorderSize + videl.YSize + videl.lowerBorderSize; +} + +#if 0 +/* this is easier & more robustly done in hostscreen.c just by + * comparing requested screen width & height to each other. + */ +static void VIDEL_getMonitorScale(int *sx, int *sy) +{ + /* Videl video mode register bits and resulting desktop resolution: + * + * quarter, half, interlace, double: pixels: -> zoom: + * rgb: + * 0 0 0 0 320x200 -> 2 x 2 + * 0 0 1 0 320x400 -> 2 x 1 + * 0 1 0 0 640x200 -> 1 x 2 ! + * 0 1 1 0 640x400 -> 1 x 1 + * vga: + * 0 0 0 1 (just double ?) + * 0 0 1 1 (double & interlace ???) + * 0 1 0 0 320x480 -> 2 x 1 ! + * 0 1 0 1 320x240 -> 2 x 2 + * 0 1 1 1 (double + interlace ???) + * 1 0 0 0 640x480 -> 1 x 1 + * 1 0 0 1 640x240 -> 1 x 2 */ - int yres = vde - vdb; - if (!(vmode & 0x02)) // interlace - yres >>= 1; - if (vmode & 0x01) // double - yres >>= 1; + int vmode = IoMem_ReadWord(0xff82c2); - return yres; + /* half pixel seems to have opposite meaning on + * VGA and RGB monitor, so they need to handled separately + */ + if (videl.monitor_type) == FALCON_MONITOR_VGA) { + if (vmode & 0x08) { /* quarter pixel */ + *sx = 1; + } else { + *sx = 2; + } + if (vmode & 0x01) { /* double line */ + *sy = 2; + } else { + *sy = 1; + } + } else { + if (vmode & 0x04) { /* half pixel */ + *sx = 1; + } else { + *sx = 2; + } + if (vmode & 0x02) { /* interlace used only on RGB ? */ + *sy = 1; + } else { + *sy = 2; + } + } } +#endif /** map the correct colortable into the correct pixel format */ static void VIDEL_updateColors(void) { - //Dprintf(("ColorUpdate in progress\n")); + int i, r, g, b, colors = 1 << videl.save_scrBpp; - int i, r, g, b, colors = 1 << bpp; +#define F_COLORS(i) IoMem_ReadByte(VIDEL_COLOR_REGS_BEGIN + (i)) +#define STE_COLORS(i) IoMem_ReadByte(0xff8240 + (i)) -#define F_COLORS(i) handleRead(VIDEL_COLOR_REGS_BEGIN + (i)) -#define STE_COLORS(i) handleRead(0xff8240 + (i)) - - if (!bUseSTShifter) { + if (!videl.bUseSTShifter) { for (i = 0; i < colors; i++) { int offset = i << 2; r = F_COLORS(offset) & 0xfc; @@ -190,70 +896,54 @@ static void VIDEL_updateColors(void) HostScreen_updatePalette(colors); } - hostColorsSync = TRUE; + videl.hostColorsSync = true; } void VIDEL_ZoomModeChanged(void) { /* User selected another zoom mode, so set a new screen resolution now */ - HostScreen_setWindowSize(width, height, bpp >= 8 ? bpp : 8); + HostScreen_setWindowSize(videl.save_scrWidth, videl.save_scrHeight, videl.save_scrBpp == 16 ? 16 : ConfigureParams.Screen.nForceBpp); } -void VIDEL_renderScreen(void) +bool VIDEL_renderScreen(void) { + videl.videoBaseAddr = VIDEL_getVideoramAddress(); // Todo: to be removed when all code is in Videl + + /* Atari screen infos */ int vw = VIDEL_getScreenWidth(); int vh = VIDEL_getScreenHeight(); int vbpp = VIDEL_getScreenBpp(); - if (since_last_change > 2) { - if (vw > 0 && vw != width) { - Dprintf(("CH width %d\n", width)); - width = vw; - since_last_change = 0; - } - if (vh > 0 && vh != height) { - Dprintf(("CH height %d\n", width)); - height = vh; - since_last_change = 0; - } - if (vbpp != bpp) { - Dprintf(("CH bpp %d\n", vbpp)); - bpp = vbpp; - since_last_change = 0; - } + int lineoffset = IoMem_ReadWord(0xff820e) & 0x01ff; /* 9 bits */ + int linewidth = IoMem_ReadWord(0xff8210) & 0x03ff; /* 10 bits */ + + bool change = false; + + if (vw > 0 && vw != videl.save_scrWidth) { + LOG_TRACE(TRACE_VIDEL, "Videl : width change from %d to %d\n", videl.save_scrWidth, vw); + videl.save_scrWidth = vw; + change = true; } - if (since_last_change == 3) { - HostScreen_setWindowSize( width, height, bpp >= 8 ? bpp : 8 ); + if (vh > 0 && vh != videl.save_scrHeight) { + LOG_TRACE(TRACE_VIDEL, "Videl : height change from %d to %d\n", videl.save_scrHeight, vh); + videl.save_scrHeight = vh; + change = true; } - if (since_last_change < 4) { - since_last_change++; - return; + if (vbpp != videl.save_scrBpp) { + LOG_TRACE(TRACE_VIDEL, "Videl : bpp change from %d to %d\n", videl.save_scrBpp, vbpp); + videl.save_scrBpp = vbpp; + change = true; } - - if (!HostScreen_renderBegin()) - return; - - if (ConfigureParams.Screen.bZoomLowRes) { - VIDEL_renderScreenZoom(); - } else { - VIDEL_renderScreenNoZoom(); + if (change) { + LOG_TRACE(TRACE_VIDEL, "Videl : video mode change to %dx%d@%d\n", videl.save_scrWidth, videl.save_scrHeight, videl.save_scrBpp); + HostScreen_setWindowSize(videl.save_scrWidth, videl.save_scrHeight, videl.save_scrBpp == 16 ? 16 : ConfigureParams.Screen.nForceBpp); } - HostScreen_renderEnd(); - - HostScreen_update1( FALSE ); -} - - -static void VIDEL_renderScreenNoZoom(void) -{ - int vw = VIDEL_getScreenWidth(); - int vh = VIDEL_getScreenHeight(); + if (!HostScreen_renderBegin()) + return false; - int lineoffset = handleReadW(HW + 0x0e) & 0x01ff; // 9 bits - int linewidth = handleReadW(HW + 0x10) & 0x03ff; // 10 bits /* I think this implementation is naive: indeed, I suspect that we should instead skip lineoffset @@ -265,31 +955,191 @@ static void VIDEL_renderScreenNoZoom(voi At last, we have also to take into account the 4 bits register located at the word $ffff8264 (bit offset). This register makes the semantics of the lineoffset register change a little. - int bitoffset = handleReadW(HW + 0x64) & 0x000f; + int bitoffset = IoMem_ReadWord(0xff8264) & 0x000f; The meaning of this register in True Color mode is not clear for me at the moment (and my experiments on the Falcon don't help me). */ int nextline = linewidth + lineoffset; - if (bpp < 16 && !hostColorsSync) { + if ((vw<32) || (vh<32)) + return false; + + if (videl.save_scrBpp < 16 && videl.hostColorsSync == 0) VIDEL_updateColors(); + + if (nScreenZoomX * nScreenZoomY != 1) { + VIDEL_ConvertScreenZoom(vw, vh, videl.save_scrBpp, nextline); + } else { + VIDEL_ConvertScreenNoZoom(vw, vh, videl.save_scrBpp, nextline); } - VIDEL_ConvertScreenNoZoom(vw, vh, bpp, nextline); + + HostScreen_renderEnd(); + HostScreen_update1(false); + + return true; } +/** + * Performs conversion from the TOS's bitplane word order (big endian) data + * into the native chunky color index. + */ +static void VIDEL_bitplaneToChunky(Uint16 *atariBitplaneData, Uint16 bpp, + Uint8 colorValues[16]) +{ + Uint32 a, b, c, d, x; + + /* Obviously the different cases can be broken out in various + * ways to lessen the amount of work needed for <8 bit modes. + * It's doubtful if the usage of those modes warrants it, though. + * The branches below should be ~100% correctly predicted and + * thus be more or less for free. + * Getting the palette values inline does not seem to help + * enough to worry about. The palette lookup is much slower than + * this code, though, so it would be nice to do something about it. + */ + if (bpp >= 4) { + d = *(Uint32 *)&atariBitplaneData[0]; + c = *(Uint32 *)&atariBitplaneData[2]; + if (bpp == 4) { + a = b = 0; + } else { + b = *(Uint32 *)&atariBitplaneData[4]; + a = *(Uint32 *)&atariBitplaneData[6]; + } + } else { + a = b = c = 0; + if (bpp == 2) { + d = *(Uint32 *)&atariBitplaneData[0]; + } else { +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + d = atariBitplaneData[0]<<16; +#else + d = atariBitplaneData[0]; +#endif + } + } + + x = a; + a = (a & 0xf0f0f0f0) | ((c & 0xf0f0f0f0) >> 4); + c = ((x & 0x0f0f0f0f) << 4) | (c & 0x0f0f0f0f); + x = b; + b = (b & 0xf0f0f0f0) | ((d & 0xf0f0f0f0) >> 4); + d = ((x & 0x0f0f0f0f) << 4) | (d & 0x0f0f0f0f); + + x = a; + a = (a & 0xcccccccc) | ((b & 0xcccccccc) >> 2); + b = ((x & 0x33333333) << 2) | (b & 0x33333333); + x = c; + c = (c & 0xcccccccc) | ((d & 0xcccccccc) >> 2); + d = ((x & 0x33333333) << 2) | (d & 0x33333333); + +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + a = (a & 0x5555aaaa) | ((a & 0x00005555) << 17) | ((a & 0xaaaa0000) >> 17); + b = (b & 0x5555aaaa) | ((b & 0x00005555) << 17) | ((b & 0xaaaa0000) >> 17); + c = (c & 0x5555aaaa) | ((c & 0x00005555) << 17) | ((c & 0xaaaa0000) >> 17); + d = (d & 0x5555aaaa) | ((d & 0x00005555) << 17) | ((d & 0xaaaa0000) >> 17); + + colorValues[ 8] = a; + a >>= 8; + colorValues[ 0] = a; + a >>= 8; + colorValues[ 9] = a; + a >>= 8; + colorValues[ 1] = a; + + colorValues[10] = b; + b >>= 8; + colorValues[ 2] = b; + b >>= 8; + colorValues[11] = b; + b >>= 8; + colorValues[ 3] = b; + + colorValues[12] = c; + c >>= 8; + colorValues[ 4] = c; + c >>= 8; + colorValues[13] = c; + c >>= 8; + colorValues[ 5] = c; + + colorValues[14] = d; + d >>= 8; + colorValues[ 6] = d; + d >>= 8; + colorValues[15] = d; + d >>= 8; + colorValues[ 7] = d; +#else + a = (a & 0xaaaa5555) | ((a & 0x0000aaaa) << 15) | ((a & 0x55550000) >> 15); + b = (b & 0xaaaa5555) | ((b & 0x0000aaaa) << 15) | ((b & 0x55550000) >> 15); + c = (c & 0xaaaa5555) | ((c & 0x0000aaaa) << 15) | ((c & 0x55550000) >> 15); + d = (d & 0xaaaa5555) | ((d & 0x0000aaaa) << 15) | ((d & 0x55550000) >> 15); + + colorValues[ 1] = a; + a >>= 8; + colorValues[ 9] = a; + a >>= 8; + colorValues[ 0] = a; + a >>= 8; + colorValues[ 8] = a; + + colorValues[ 3] = b; + b >>= 8; + colorValues[11] = b; + b >>= 8; + colorValues[ 2] = b; + b >>= 8; + colorValues[10] = b; + + colorValues[ 5] = c; + c >>= 8; + colorValues[13] = c; + c >>= 8; + colorValues[ 4] = c; + c >>= 8; + colorValues[12] = c; + + colorValues[ 7] = d; + d >>= 8; + colorValues[15] = d; + d >>= 8; + colorValues[ 6] = d; + d >>= 8; + colorValues[14] = d; +#endif +} + void VIDEL_ConvertScreenNoZoom(int vw, int vh, int vbpp, int nextline) { int scrpitch = HostScreen_getPitch(); + int h, w, j; - long atariVideoRAM = VIDEL_getVideoramAddress(); + Uint16 *fvram = (Uint16 *) Atari2HostAddr(videl.videoBaseAddr); + Uint8 *hvram = HostScreen_getVideoramAddress(); + SDL_PixelFormat *scrfmt = HostScreen_getFormat(); - uint16 *fvram = (uint16 *) Atari2HostAddr(atariVideoRAM); - uint8 *hvram = HostScreen_getVideoramAddress(); + Uint16 lowBorderSize, rightBorderSize; - int hscrolloffset = (handleRead(HW + 0x65) & 0x0f); + int hscrolloffset = IoMem_ReadByte(0xff8265) & 0x0f; + + /* Horizontal scroll register set? */ + if (hscrolloffset) { + /* Yes, so we need to adjust offset to next line: */ + nextline += vbpp; + } + + /* If emulated computer is the TT, we use the same rendering for display, but without the borders */ + if (ConfigureParams.System.nMachineType == MACHINE_TT) { + videl.leftBorderSize = 0; + videl.rightBorderSize = 0; + videl.upperBorderSize = 0; + videl.lowerBorderSize = 0; + fvram = (Uint16 *) Atari2HostAddr(VIDEL_getVideoramAddress()); + } /* Clip to SDL_Surface dimensions */ int scrwidth = HostScreen_getWidth(); @@ -299,285 +1149,350 @@ void VIDEL_ConvertScreenNoZoom(int vw, i if (vw>scrwidth) vw_clip = scrwidth; if (vh>scrheight) vh_clip = scrheight; - /* Horizontal scroll register set? */ - if (hscrolloffset) { - /* Yes, so we need to adjust offset to next line: */ - nextline += vbpp; + /* If emulated computer is the FALCON, we must take : + * vw = X area display size and not all the X screen with the borders into account + * vh = Y area display size and not all the Y screen with the borders into account + */ + if (ConfigureParams.System.nMachineType == MACHINE_FALCON) { + vw = videl.XSize; + vh = videl.YSize; + } + + /* If there's not enough space to display the left border, just return */ + if (vw_clip < videl.leftBorderSize) + return; + /* If there's not enough space for the left border + the graphic area, we clip */ + if (vw_clip < vw + videl.leftBorderSize) { + vw = vw_clip - videl.leftBorderSize; + rightBorderSize = 0; + } + /* if there's not enough space for the left border + the graphic area + the right border, we clip the border */ + else if (vw_clip < vw + videl.leftBorderSize + videl.rightBorderSize) + rightBorderSize = vw_clip - videl.leftBorderSize - vw; + else + rightBorderSize = videl.rightBorderSize; + + /* If there's not enough space to display the upper border, just return */ + if (vh_clip < videl.upperBorderSize) + return; + + /* If there's not enough space for the upper border + the graphic area, we clip */ + if (vh_clip < vh + videl.upperBorderSize) { + vh = vh_clip - videl.upperBorderSize; + lowBorderSize = 0; } + /* if there's not enough space for the upper border + the graphic area + the lower border, we clip the border */ + else if (vh_clip < vh + videl.upperBorderSize + videl.lowerBorderSize) + lowBorderSize = vh_clip - videl.upperBorderSize - vh; + else + lowBorderSize = videl.lowerBorderSize; /* Center screen */ hvram += ((scrheight-vh_clip)>>1)*scrpitch; hvram += ((scrwidth-vw_clip)>>1)*HostScreen_getBpp(); - /* Render */ + Uint16 *fvram_line = fvram; + scrwidth = videl.leftBorderSize + vw + videl.rightBorderSize; + + /* render the graphic area */ if (vbpp < 16) { /* Bitplanes modes */ - // The SDL colors blitting... - uint8 color[16]; + /* The SDL colors blitting... */ + Uint8 color[16]; - // FIXME: The byte swap could be done here by enrolling the loop into 2 each by 8 pixels + /* FIXME: The byte swap could be done here by enrolling the loop into 2 each by 8 pixels */ switch ( HostScreen_getBpp() ) { case 1: - { - uint16 *fvram_line = fvram; - uint8 *hvram_line = hvram; - int h; - - for (h = 0; h < vh_clip; h++) { - uint16 *fvram_column = fvram_line; - uint8 *hvram_column = hvram_line; - int w; + { + Uint8 *hvram_line = hvram; - /* First 16 pixels: */ - HostScreen_bitplaneToChunky(fvram_column, vbpp, color); - memcpy(hvram_column, color+hscrolloffset, 16-hscrolloffset); - hvram_column += 16-hscrolloffset; - fvram_column += vbpp; - /* Now the main part of the line: */ - for (w = 1; w < (vw_clip+15)>>4; w++) { - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); - memcpy(hvram_column, color, 16); - hvram_column += 16; - fvram_column += vbpp; - } - /* Last pixels of the line for fine scrolling: */ - if (hscrolloffset) { - HostScreen_bitplaneToChunky(fvram_column, vbpp, color); - memcpy(hvram_column, color, hscrolloffset); - } + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; + } - hvram_line += scrpitch; - fvram_line += nextline; + /* Render the graphical area */ + for (h = 0; h < vh; h++) { + Uint16 *fvram_column = fvram_line; + Uint8 *hvram_column = hvram_line; + + /* Left border first */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize); + hvram_column += videl.leftBorderSize; + + /* First 16 pixels */ + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + memcpy(hvram_column, color+hscrolloffset, 16-hscrolloffset); + hvram_column += 16-hscrolloffset; + fvram_column += vbpp; + /* Now the main part of the line */ + for (w = 1; w < (vw+15)>>4; w++) { + VIDEL_bitplaneToChunky( fvram_column, vbpp, color ); + memcpy(hvram_column, color, 16); + hvram_column += 16; + fvram_column += vbpp; + } + /* Last pixels of the line for fine scrolling */ + if (hscrolloffset) { + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + memcpy(hvram_column, color, hscrolloffset); } + /* Right border */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), rightBorderSize); + + fvram_line += nextline; + hvram_line += scrpitch; } - break; + + /* Render the lower border */ + for (h = 0; h < lowBorderSize; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; + } + } + break; case 2: - { - uint16 *fvram_line = fvram; - uint16 *hvram_line = (uint16 *)hvram; - int h; - - for (h = 0; h < vh_clip; h++) { - uint16 *fvram_column = fvram_line; - uint16 *hvram_column = hvram_line; - int w; - - for (w = 0; w < (vw_clip+15)>>4; w++) { - int j; - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); + { + Uint16 *hvram_line = (Uint16 *)hvram; - for (j=0; j<16; j++) { - *hvram_column++ = HostScreen_getPaletteColor( color[j] ); - } + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; + } - fvram_column += vbpp; + /* Render the graphical area */ + for (h = 0; h < vh; h++) { + Uint16 *fvram_column = fvram_line; + Uint16 *hvram_column = hvram_line; + + /* Left border first */ + VIDEL_memset_uint16 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize); + hvram_column += videl.leftBorderSize; + + /* First 16 pixels */ + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + for (j = 0; j < 16 - hscrolloffset; j++) { + *hvram_column++ = HostScreen_getPaletteColor(color[j+hscrolloffset]); + } + fvram_column += vbpp; + /* Now the main part of the line */ + for (w = 1; w < (vw+15)>>4; w++) { + VIDEL_bitplaneToChunky( fvram_column, vbpp, color ); + for (j=0; j<16; j++) { + *hvram_column++ = HostScreen_getPaletteColor( color[j] ); } - - hvram_line += scrpitch>>1; - fvram_line += nextline; + fvram_column += vbpp; } - } - break; - case 3: - { - uint16 *fvram_line = fvram; - uint8 *hvram_line = hvram; - int h; - - for (h = 0; h < vh_clip; h++) { - uint16 *fvram_column = fvram_line; - uint8 *hvram_column = hvram_line; - int w; - - for (w = 0; w < (vw_clip+15)>>4; w++) { - int j; - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); - - for (j=0; j<16; j++) { - uint32 tmpColor = HostScreen_getPaletteColor( color[j] ); - putBpp24Pixel( hvram_column, tmpColor ); - hvram_column += 3; - } - - fvram_column += vbpp; + /* Last pixels of the line for fine scrolling */ + if (hscrolloffset) { + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + for (j = 0; j < hscrolloffset; j++) { + *hvram_column++ = HostScreen_getPaletteColor(color[j]); } - - hvram_line += scrpitch; - fvram_line += nextline; } + /* Right border */ + VIDEL_memset_uint16 (hvram_column, HostScreen_getPaletteColor(0), rightBorderSize); + + fvram_line += nextline; + hvram_line += scrpitch>>1; } - break; + + /* Render the lower border */ + for (h = 0; h < lowBorderSize; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; + } + } + break; case 4: - { - uint16 *fvram_line = fvram; - uint32 *hvram_line = (uint32 *)hvram; - int h; - - for (h = 0; h < vh_clip; h++) { - uint16 *fvram_column = fvram_line; - uint32 *hvram_column = hvram_line; - int w; - - for (w = 0; w < (vw_clip+15)>>4; w++) { - int j; - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); + { + Uint32 *hvram_line = (Uint32 *)hvram; - for (j=0; j<16; j++) { - *hvram_column++ = HostScreen_getPaletteColor( color[j] ); - } + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>2; + } - fvram_column += vbpp; + /* Render the graphical area */ + for (h = 0; h < vh; h++) { + Uint16 *fvram_column = fvram_line; + Uint32 *hvram_column = hvram_line; + + /* Left border first */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize); + hvram_column += videl.leftBorderSize; + + /* First 16 pixels */ + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + for (j = 0; j < 16 - hscrolloffset; j++) { + *hvram_column++ = HostScreen_getPaletteColor(color[j+hscrolloffset]); + } + fvram_column += vbpp; + /* Now the main part of the line */ + for (w = 1; w < (vw+15)>>4; w++) { + VIDEL_bitplaneToChunky( fvram_column, vbpp, color ); + for (j=0; j<16; j++) { + *hvram_column++ = HostScreen_getPaletteColor( color[j] ); } - - hvram_line += scrpitch>>2; - fvram_line += nextline; + fvram_column += vbpp; } + /* Last pixels of the line for fine scrolling */ + if (hscrolloffset) { + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + for (j = 0; j < hscrolloffset; j++) { + *hvram_column++ = HostScreen_getPaletteColor(color[j]); + } + } + /* Right border */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), rightBorderSize); + + fvram_line += nextline; + hvram_line += scrpitch>>2; } - break; + + /* Render the lower border */ + for (h = 0; h < lowBorderSize; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>2; + } + } + break; } } else { - // Falcon TC (High Color) + /* Falcon TC (High Color) */ switch ( HostScreen_getBpp() ) { case 1: - { - /* FIXME: when Videl switches to 16bpp, set the palette to 3:3:2 */ - uint16 *fvram_line = fvram; - uint8 *hvram_line = hvram; - int h; - - for (h = 0; h < vh_clip; h++) { - uint16 *fvram_column = fvram_line; - uint8 *hvram_column = hvram_line; - int w, tmp; - - for (w = 0; w < vw_clip; w++) { - - tmp = SDL_SwapBE16(*fvram_column); + { + /* FIXME: when Videl switches to 16bpp, set the palette to 3:3:2 */ + Uint8 *hvram_line = hvram; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; + } - *hvram_column = ((tmp>>13) & 7) << 5; - *hvram_column |= ((tmp>>8) & 7) << 2; - *hvram_column |= ((tmp>>2) & 3); + /* Render the graphical area */ + for (h = 0; h < vh; h++) { + Uint16 *fvram_column = fvram_line; + Uint8 *hvram_column = hvram_line; + int tmp; + + /* Left border first */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize); + hvram_column += videl.leftBorderSize; + + /* Graphical area */ + for (w = 0; w < vw; w++) { + tmp = SDL_SwapBE16(*fvram_column++); + *hvram_column++ = (((tmp>>13) & 7) << 5) + (((tmp>>8) & 7) << 2) + (((tmp>>2) & 3)); + } - hvram_column++; - fvram_column++; - } + /* Right border */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), rightBorderSize); - hvram_line += scrpitch; - fvram_line += nextline; - } + fvram_line += nextline; + hvram_line += scrpitch; } - break; + /* Render the bottom border */ + for (h = 0; h < lowBorderSize; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; + } + } + break; case 2: - { - uint16 *fvram_line = fvram; - uint16 *hvram_line = (uint16 *)hvram; - int h; + { + Uint16 *hvram_line = (Uint16 *)hvram; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; + } + + /* Render the graphical area */ + for (h = 0; h < vh; h++) { + Uint16 *hvram_column = hvram_line; + + /* Left border first */ + VIDEL_memset_uint16 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize); + hvram_column += videl.leftBorderSize; - for (h = 0; h < vh_clip; h++) { #if SDL_BYTEORDER == SDL_BIG_ENDIAN - //FIXME: here might be a runtime little/big video endian switch like: - // if ( /* videocard memory in Motorola endian format */ false) - memcpy(hvram_line, fvram_line, vw_clip<<1); + /* FIXME: here might be a runtime little/big video endian switch like: + if ( " videocard memory in Motorola endian format " false) + */ + memcpy(hvram_column, fvram_line, vw<<1); + hvram_column += vw<<1; #else - int w; - uint16 *fvram_column = fvram_line; - uint16 *hvram_column = hvram_line; - - for (w = 0; w < vw_clip; w++) { - // byteswap with SDL asm macros - *hvram_column++ = SDL_SwapBE16(*fvram_column++); - } -#endif // SDL_BYTEORDER == SDL_BIG_ENDIAN + Uint16 *fvram_column = fvram_line; + /* Graphical area */ + for (w = 0; w < vw; w++) + *hvram_column ++ = SDL_SwapBE16(*fvram_column++); +#endif /* SDL_BYTEORDER == SDL_BIG_ENDIAN */ - hvram_line += scrpitch>>1; - fvram_line += nextline; - } - } - break; - case 3: - { - uint16 *fvram_line = fvram; - uint8 *hvram_line = hvram; - int h; - - for (h = 0; h < vh_clip; h++) { - uint16 *fvram_column = fvram_line; - uint8 *hvram_column = hvram_line; - int w; - - for (w = 0; w < vw_clip; w++) { - int data = *fvram_column++; - - uint32 tmpColor = - HostScreen_getColor( - (uint8) (data & 0xf8), - (uint8) ( ((data & 0x07) << 5) | - ((data >> 11) & 0x3c)), - (uint8) ((data >> 5) & 0xf8)); - - putBpp24Pixel( hvram_column, tmpColor ); + /* Right border */ + VIDEL_memset_uint16 (hvram_column, HostScreen_getPaletteColor(0), rightBorderSize); - hvram_column += 3; - } + fvram_line += nextline; + hvram_line += scrpitch>>1; + } - hvram_line += scrpitch; - fvram_line += nextline; - } + /* Render the bottom border */ + for (h = 0; h < lowBorderSize; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; } - break; + } + break; case 4: - { - uint16 *fvram_line = fvram; - uint32 *hvram_line = (uint32 *)hvram; - int h; - - for (h = 0; h < vh_clip; h++) { - uint16 *fvram_column = fvram_line; - uint32 *hvram_column = hvram_line; - int w; - - for (w = 0; w < vw_clip; w++) { - int data = *fvram_column++; - - *hvram_column++ = - HostScreen_getColor( - (uint8) (data & 0xf8), - (uint8) ( ((data & 0x07) << 5) | - ((data >> 11) & 0x3c)), - (uint8) ((data >> 5) & 0xf8)); - } + { + Uint32 *hvram_line = (Uint32 *)hvram; - hvram_line += scrpitch>>2; - fvram_line += nextline; - } + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>2; } - break; - } - } -} + /* Render the graphical area */ + for (h = 0; h < vh; h++) { + Uint16 *fvram_column = fvram_line; + Uint32 *hvram_column = hvram_line; + + /* Left border first */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize); + hvram_column += videl.leftBorderSize; + + /* Graphical area */ + for (w = 0; w < vw; w++) { + Uint16 srcword = *fvram_column++; + *hvram_column ++ = SDL_MapRGB(scrfmt, (srcword & 0xf8), (((srcword & 0x07) << 5) | ((srcword >> 11) & 0x3c)), ((srcword >> 5) & 0xf8)); + } -static void VIDEL_renderScreenZoom(void) -{ - /* Atari screen infos */ - int vw = VIDEL_getScreenWidth(); - int vh = VIDEL_getScreenHeight(); - - int lineoffset = handleReadW(HW + 0x0e) & 0x01ff; // 9 bits - int linewidth = handleReadW(HW + 0x10) & 0x03ff; // 10 bits - /* same remark as before: too naive */ - int nextline = linewidth + lineoffset; + /* Right border */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), rightBorderSize); + } - if ((vw<32) || (vh<32)) return; + fvram_line += nextline; + hvram_line += scrpitch>>2; - if (bpp<16 && !hostColorsSync) { - VIDEL_updateColors(); + /* Render the bottom border */ + for (h = 0; h < lowBorderSize; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>2; + } + } + break; + } } - - VIDEL_ConvertScreenZoom(vw, vh, bpp, nextline); } @@ -585,16 +1500,33 @@ void VIDEL_ConvertScreenZoom(int vw, int { int i, j, w, h, cursrcline; - uint16 *fvram = (uint16 *) Atari2HostAddr(VIDEL_getVideoramAddress()); + Uint16 *fvram = (Uint16 *) Atari2HostAddr(videl.videoBaseAddr); + Uint16 *fvram_line; + Uint16 scrIdx = 0; + + int coefx = 1; + int coefy = 1; + + /* If emulated computer is the TT, we use the same rendering for display, but without the borders */ + if (ConfigureParams.System.nMachineType == MACHINE_TT) { + videl.leftBorderSize = 0; + videl.rightBorderSize = 0; + videl.upperBorderSize = 0; + videl.lowerBorderSize = 0; + videl.XSize = vw; + videl.YSize = vh; + fvram = (Uint16 *) Atari2HostAddr(VIDEL_getVideoramAddress()); + } /* Host screen infos */ int scrpitch = HostScreen_getPitch(); int scrwidth = HostScreen_getWidth(); int scrheight = HostScreen_getHeight(); int scrbpp = HostScreen_getBpp(); - uint8 *hvram = (uint8 *) HostScreen_getVideoramAddress(); + SDL_PixelFormat *scrfmt = HostScreen_getFormat(); + Uint8 *hvram = (Uint8 *) HostScreen_getVideoramAddress(); - int hscrolloffset = (handleRead(HW + 0x65) & 0x0f); + int hscrolloffset = IoMem_ReadByte(0xff8265) & 0x0f; /* Horizontal scroll register set? */ if (hscrolloffset) { @@ -604,8 +1536,8 @@ void VIDEL_ConvertScreenZoom(int vw, int /* Integer zoom coef ? */ if (/*(bx_options.autozoom.integercoefs) &&*/ (scrwidth>=vw) && (scrheight>=vh)) { - int coefx = scrwidth/vw; - int coefy = scrheight/vh; + coefx = scrwidth/vw; + coefy = scrheight/vh; scrwidth = vw * coefx; scrheight = vh * coefy; @@ -616,362 +1548,458 @@ void VIDEL_ConvertScreenZoom(int vw, int } /* New zoom ? */ - if ((zoomwidth != vw) || (scrwidth != prev_scrwidth)) { - if (zoomxtable) { - free(zoomxtable); + if ((videl_zoom.zoomwidth != vw) || (scrwidth != videl_zoom.prev_scrwidth)) { + if (videl_zoom.zoomxtable) { + free(videl_zoom.zoomxtable); } - zoomxtable = malloc(sizeof(int)*scrwidth); + videl_zoom.zoomxtable = malloc(sizeof(int)*scrwidth); for (i=0; i>4; w++) { - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); - memcpy(hvram_column, color, 16); - hvram_column += 16; - fvram_column += vbpp; - } - /* Last pixels of the line for fine scrolling: */ - if (hscrolloffset) { - HostScreen_bitplaneToChunky(fvram_column, vbpp, color); - memcpy(hvram_column, color, hscrolloffset); - } + { + /* One complete 16-pixel aligned planar 2 chunky line */ + Uint8 *p2cline = malloc(sizeof(Uint8) * ((vw+15) & ~15)); + Uint8 *hvram_line = hvram; + Uint8 *hvram_column = p2cline; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize * coefy; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; + } - /* Zoom a new line */ - for (w=0; w>1), scrwidth*scrbpp); - } else { - uint16 *fvram_column = fvram_line; - uint16 *hvram_column = p2cline; - - /* Convert a new line */ - for (w=0; w < (vw+15)>>4; w++) { - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); - - for (j=0; j<16; j++) { - *hvram_column++ = HostScreen_getPaletteColor( color[j] ); - } + /* Recopy the same line ? */ + if (videl_zoom.zoomytable[h] == cursrcline) { + memcpy(hvram_line, hvram_line-scrpitch, scrwidth*scrbpp); + } else { + Uint16 *fvram_column = fvram_line; + hvram_column = p2cline; - fvram_column += vbpp; - } - - /* Zoom a new line */ - for (w=0; w>4; w++) { + VIDEL_bitplaneToChunky( fvram_column, vbpp, color ); + memcpy(hvram_column, color, 16); + hvram_column += 16; + fvram_column += vbpp; } + /* Last pixels of the line for fine scrolling */ + if (hscrolloffset) { + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + memcpy(hvram_column, color, hscrolloffset); + } + + hvram_column = hvram_line; - hvram_line += scrpitch>>1; - cursrcline = zoomytable[h]; + /* Display the Left border */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize * coefx); + hvram_column += videl.leftBorderSize * coefx; + + /* Display the Graphical area */ + for (w=0; w<(vw*coefx); w++) + hvram_column[w] = p2cline[videl_zoom.zoomxtable[w - videl.leftBorderSize * coefx]]; + hvram_column += vw * coefx; + + /* Display the Right border */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), videl.rightBorderSize * coefx); + hvram_column += videl.rightBorderSize * coefx; } - free(p2cline); + hvram_line += scrpitch; + cursrcline = videl_zoom.zoomytable[h]; + } + + /* Render the lower border */ + for (h = 0; h < videl.lowerBorderSize * coefy; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; } - break; - case 3: - { - /* One complete planar 2 chunky line */ - uint8 *p2cline = malloc(sizeof(uint8)*vw*3); - - uint16 *fvram_line; - uint8 *hvram_line = hvram; - - for (h = 0; h < scrheight; h++) { - fvram_line = fvram + (zoomytable[h] * nextline); - - /* Recopy the same line ? */ - if (zoomytable[h] == cursrcline) { - memcpy(hvram_line, hvram_line-scrpitch, scrwidth*scrbpp); - } else { - uint16 *fvram_column = fvram_line; - uint8 *hvram_column = p2cline; - - /* Convert a new line */ - for (w=0; w < (vw+15)>>4; w++) { - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); - - for (j=0; j<16; j++) { - uint32 tmpColor = HostScreen_getPaletteColor( color[j] ); - putBpp24Pixel( hvram_column, tmpColor ); - hvram_column += 3; - } - fvram_column += vbpp; + free(p2cline); + } + break; + case 2: + { + /* One complete 16-pixel aligned planar 2 chunky line */ + Uint16 *p2cline = malloc(sizeof(Uint16) * ((vw+15) & ~15)); + Uint16 *hvram_line = (Uint16 *)hvram; + Uint16 *hvram_column = p2cline; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize * coefy; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; + } + + /* Render the graphical area */ + for (h = 0; h < scrheight; h++) { + fvram_line = fvram + (videl_zoom.zoomytable[scrIdx] * nextline); + scrIdx ++; + + /* Recopy the same line ? */ + if (videl_zoom.zoomytable[h] == cursrcline) { + memcpy(hvram_line, hvram_line-(scrpitch>>1), scrwidth*scrbpp); + } else { + Uint16 *fvram_column = fvram_line; + hvram_column = p2cline; + + /* First 16 pixels of a new line */ + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + for (j = 0; j < 16 - hscrolloffset; j++) { + *hvram_column++ = HostScreen_getPaletteColor(color[j+hscrolloffset]); + } + fvram_column += vbpp; + /* Convert the main part of the new line */ + for (w = 1; w < (vw+15)>>4; w++) { + VIDEL_bitplaneToChunky( fvram_column, vbpp, color ); + for (j=0; j<16; j++) { + *hvram_column++ = HostScreen_getPaletteColor( color[j] ); } - - /* Zoom a new line */ - for (w=0; w>1; + cursrcline = videl_zoom.zoomytable[h]; } - break; + + /* Render the lower border */ + for (h = 0; h < videl.lowerBorderSize * coefy; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; + } + + free(p2cline); + } + break; case 4: - { - /* One complete planar 2 chunky line */ - uint32 *p2cline = malloc(sizeof(uint32)*vw); - - uint16 *fvram_line; - uint32 *hvram_line = (uint32 *)hvram; - - for (h = 0; h < scrheight; h++) { - fvram_line = fvram + (zoomytable[h] * nextline); - - /* Recopy the same line ? */ - if (zoomytable[h] == cursrcline) { - memcpy(hvram_line, hvram_line-(scrpitch>>2), scrwidth*scrbpp); - } else { - uint16 *fvram_column = fvram_line; - uint32 *hvram_column = p2cline; - - /* Convert a new line */ - for (w=0; w < (vw+15)>>4; w++) { - HostScreen_bitplaneToChunky( fvram_column, vbpp, color ); - - for (j=0; j<16; j++) { - *hvram_column++ = HostScreen_getPaletteColor( color[j] ); - } + { + /* One complete 16-pixel aligned planar 2 chunky line */ + Uint32 *p2cline = malloc(sizeof(Uint32) * ((vw+15) & ~15)); + Uint32 *hvram_line = (Uint32 *)hvram; + Uint32 *hvram_column = p2cline; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize * coefy; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>2; + } - fvram_column += vbpp; + /* Render the graphical area */ + for (h = 0; h < scrheight; h++) { + fvram_line = fvram + (videl_zoom.zoomytable[scrIdx] * nextline); + scrIdx ++; + /* Recopy the same line ? */ + if (videl_zoom.zoomytable[h] == cursrcline) { + memcpy(hvram_line, hvram_line-(scrpitch>>2), scrwidth*scrbpp); + } else { + Uint16 *fvram_column = fvram_line; + hvram_column = p2cline; + + /* First 16 pixels of a new line */ + VIDEL_bitplaneToChunky(fvram_column, vbpp, color); + for (j = 0; j < 16 - hscrolloffset; j++) { + *hvram_column++ = HostScreen_getPaletteColor(color[j+hscrolloffset]); + } + fvram_column += vbpp; + /* Convert the main part of the new line */ + for (w = 1; w < (vw+15)>>4; w++) { + VIDEL_bitplaneToChunky( fvram_column, vbpp, color ); + for (j=0; j<16; j++) { + *hvram_column++ = HostScreen_getPaletteColor( color[j] ); } - - /* Zoom a new line */ - for (w=0; w>2; - cursrcline = zoomytable[h]; + hvram_column = hvram_line; + /* Display the Left border */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize * coefx); + hvram_column += videl.leftBorderSize * coefx; + + /* Display the Graphical area */ + for (w=0; w<(vw*coefx); w++) { + hvram_column[w] = p2cline[videl_zoom.zoomxtable[w]]; + } + hvram_column += vw * coefx; + + /* Display the Right border */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), videl.rightBorderSize * coefx); + hvram_column += videl.rightBorderSize * coefx; } - free(p2cline); + hvram_line += scrpitch>>2; + cursrcline = videl_zoom.zoomytable[h]; } - break; + + /* Render the lower border */ + for (h = 0; h < videl.lowerBorderSize * coefy; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>2; + } + + free(p2cline); + } + break; } } else { - /* Falcon TrueColour mode */ + /* Falcon high-color (16-bit) mode */ switch(scrbpp) { case 1: - { - /* FIXME: when Videl switches to 16bpp, set the palette to 3:3:2 */ - uint16 *fvram_line; - uint8 *hvram_line = hvram; - - for (h = 0; h < scrheight; h++) { - uint16 *fvram_column; - uint8 *hvram_column; + { + /* FIXME: when Videl switches to 16bpp, set the palette to 3:3:2 */ + Uint8 *hvram_line = hvram; + Uint8 *hvram_column = hvram_line; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize * coefy; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; + } - fvram_line = fvram + (zoomytable[h] * nextline); - fvram_column = fvram_line; - hvram_column = hvram_line; + /* Render the graphical area */ + for (h = 0; h < scrheight; h++) { + Uint16 *fvram_column; + + fvram_line = fvram + (videl_zoom.zoomytable[scrIdx] * nextline); + scrIdx ++; + + fvram_column = fvram_line; + + /* Recopy the same line ? */ + if (videl_zoom.zoomytable[h] == cursrcline) { + memcpy(hvram_line, hvram_line-scrpitch, scrwidth*scrbpp); + } else { - /* Recopy the same line ? */ - if (zoomytable[h] == cursrcline) { - memcpy(hvram_line, hvram_line-scrpitch, scrwidth*scrbpp); - } else { - for (w = 0; w < scrwidth; w++) { - uint16 srcword; - uint8 dstbyte; + hvram_column = hvram_line; + /* Display the Left border */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize * coefx); + hvram_column += videl.leftBorderSize * coefx; + + /* Display the Graphical area */ + for (w = 0; w<(vw*coefx); w++) { + Uint16 srcword; + Uint8 dstbyte; - srcword = SDL_SwapBE16(fvram_column[zoomxtable[w]]); + srcword = SDL_SwapBE16(fvram_column[videl_zoom.zoomxtable[w - videl.leftBorderSize * coefx]]); - dstbyte = ((srcword>>13) & 7) << 5; - dstbyte |= ((srcword>>8) & 7) << 2; - dstbyte |= ((srcword>>2) & 3); - - *hvram_column++ = dstbyte; - } + dstbyte = ((srcword>>13) & 7) << 5; + dstbyte |= ((srcword>>8) & 7) << 2; + dstbyte |= ((srcword>>2) & 3); + *hvram_column++ = dstbyte; } - hvram_line += scrpitch; - cursrcline = zoomytable[h]; + /* Display the Right border */ + VIDEL_memset_uint8 (hvram_column, HostScreen_getPaletteColor(0), videl.rightBorderSize * coefx); + hvram_column += videl.rightBorderSize * coefx; } - } - break; - case 2: - { - uint16 *fvram_line; - uint16 *hvram_line = (uint16 *)hvram; - - for (h = 0; h < scrheight; h++) { - uint16 *fvram_column; - uint16 *hvram_column; - - fvram_line = fvram + (zoomytable[h] * nextline); - fvram_column = fvram_line; - hvram_column = hvram_line; - /* Recopy the same line ? */ - if (zoomytable[h] == cursrcline) { - memcpy(hvram_line, hvram_line-(scrpitch>>1), scrwidth*scrbpp); - } else { - for (w = 0; w < scrwidth; w++) { - uint16 srcword; - - srcword = SDL_SwapBE16(fvram_column[zoomxtable[w]]); - *hvram_column++ = srcword; - } - } + hvram_line += scrpitch; + cursrcline = videl_zoom.zoomytable[h]; + } - hvram_line += scrpitch>>1; - cursrcline = zoomytable[h]; - } + /* Render the lower border */ + for (h = 0; h < videl.lowerBorderSize * coefy; h++) { + VIDEL_memset_uint8 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch; + } + } + break; + case 2: + { + Uint16 *hvram_line = (Uint16 *)hvram; + Uint16 *hvram_column = hvram_line; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize * coefy; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; } - break; - case 3: - { - uint16 *fvram_line; - uint8 *hvram_line = hvram; - - for (h = 0; h < scrheight; h++) { - uint16 *fvram_column; - uint8 *hvram_column; - fvram_line = fvram + (zoomytable[h] * nextline); - fvram_column = fvram_line; - hvram_column = hvram_line; + /* Render the graphical area */ + for (h = 0; h < scrheight; h++) { + Uint16 *fvram_column; + + fvram_line = fvram + (videl_zoom.zoomytable[scrIdx] * nextline); + scrIdx ++; + + fvram_column = fvram_line; + + /* Recopy the same line ? */ + if (videl_zoom.zoomytable[h] == cursrcline) { + memcpy(hvram_line, hvram_line-(scrpitch>>1), scrwidth*scrbpp); + } else { - /* Recopy the same line ? */ - if (zoomytable[h] == cursrcline) { - memcpy(hvram_line, hvram_line-scrpitch, scrwidth*scrbpp); - } else { - for (w = 0; w < scrwidth; w++) { - uint16 srcword; - uint32 dstlong; - - srcword = fvram_column[zoomxtable[w]]; + hvram_column = hvram_line; - dstlong = HostScreen_getColor( - (uint8) (srcword & 0xf8), - (uint8) ( ((srcword & 0x07) << 5) | - ((srcword >> 11) & 0x3c)), - (uint8) ((srcword >> 5) & 0xf8)); + /* Display the Left border */ + VIDEL_memset_uint16 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize * coefx); + hvram_column += videl.leftBorderSize * coefx; + + /* Display the Graphical area */ + for (w=0; w<(vw*coefx); w++) + *hvram_column++ = SDL_SwapBE16(fvram_column[videl_zoom.zoomxtable[w]]); - putBpp24Pixel( hvram_column, dstlong ); - hvram_column += 3; - } - } - hvram_line += scrpitch; - cursrcline = zoomytable[h]; + /* Display the Right border */ + VIDEL_memset_uint16 (hvram_column, HostScreen_getPaletteColor(0), videl.rightBorderSize * coefx); + hvram_column += videl.rightBorderSize * coefx; } + + hvram_line += scrpitch>>1; + cursrcline = videl_zoom.zoomytable[h]; } - break; + + /* Render the lower border */ + for (h = 0; h < videl.lowerBorderSize * coefy; h++) { + VIDEL_memset_uint16 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>1; + } + } + break; case 4: - { - uint16 *fvram_line; - uint32 *hvram_line = (uint32 *)hvram; - - for (h = 0; h < scrheight; h++) { - uint16 *fvram_column; - uint32 *hvram_column; + { + Uint32 *hvram_line = (Uint32 *)hvram; + Uint32 *hvram_column = hvram_line; + + /* Render the upper border */ + for (h = 0; h < videl.upperBorderSize * coefy; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + } + + /* Render the graphical area */ + for (h = 0; h < scrheight; h++) { + Uint16 *fvram_column; + + fvram_line = fvram + (videl_zoom.zoomytable[scrIdx] * nextline); + scrIdx ++; + fvram_column = fvram_line; + + /* Recopy the same line ? */ + if (videl_zoom.zoomytable[h] == cursrcline) { + memcpy(hvram_line, hvram_line-(scrpitch>>2), scrwidth*scrbpp); + hvram_line += scrpitch>>2; + } else { - fvram_line = fvram + (zoomytable[h] * nextline); - fvram_column = fvram_line; hvram_column = hvram_line; - /* Recopy the same line ? */ - if (zoomytable[h] == cursrcline) { - memcpy(hvram_line, hvram_line-(scrpitch>>2), scrwidth*scrbpp); - } else { - for (w = 0; w < scrwidth; w++) { - uint16 srcword; - - srcword = fvram_column[zoomxtable[w]]; + /* Display the Left border */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), videl.leftBorderSize * coefx); + hvram_column += videl.leftBorderSize * coefx; + + /* Display the Graphical area */ + for (w = 0; w<(vw*coefx); w++) { + Uint16 srcword; - *hvram_column++ = - HostScreen_getColor( - (uint8) (srcword & 0xf8), - (uint8) ( ((srcword & 0x07) << 5) | - ((srcword >> 11) & 0x3c)), - (uint8) ((srcword >> 5) & 0xf8)); - } + srcword = fvram_column[videl_zoom.zoomxtable[w]]; + *hvram_column++ = SDL_MapRGB(scrfmt, (srcword & 0xf8), (((srcword & 0x07) << 5) | ((srcword >> 11) & 0x3c)), ((srcword >> 5) & 0xf8)); } - hvram_line += scrpitch>>2; - cursrcline = zoomytable[h]; + /* Display the Right border */ + VIDEL_memset_uint32 (hvram_column, HostScreen_getPaletteColor(0), videl.rightBorderSize * coefx); + hvram_column += videl.rightBorderSize * coefx; } + + hvram_line += scrpitch>>2; + cursrcline = videl_zoom.zoomytable[h]; } - break; + + /* Render the lower border */ + for (h = 0; h < videl.lowerBorderSize * coefy; h++) { + VIDEL_memset_uint32 (hvram_line, HostScreen_getPaletteColor(0), scrwidth); + hvram_line += scrpitch>>2; + } + } + break; } } } + +static void VIDEL_memset_uint32(Uint32 *addr, Uint32 color, int count) +{ + while (count-- > 0) { + *addr++ = color; + } +} + +static void VIDEL_memset_uint16(Uint16 *addr, Uint16 color, int count) +{ + while (count-- > 0) { + *addr++ = color; + } +} + +static void VIDEL_memset_uint8(Uint8 *addr, Uint8 color, int count) +{ + memset(addr, color, count); +}