Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed 256 color positioning

This commit is contained in:
Tony Kuker 2022-01-19 19:59:04 +00:00
parent 0fefe5ed69
commit eff5bc14a6
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/raspberrypi/devices/scsi_powerview.cpp
View File

@ -687,8 +687,8 @@ bool SCSIPowerView::WriteFrameBuffer(const DWORD *cdb, const BYTE *buf, const DW
case(eColors256):
// Two Bytes per pixel
update_width_px = update_width_x_bytes;
offset_row_px = (uint32_t)((offset) / screen_width_px)/2;
offset_col_px = (uint32_t)(((offset)/2) % screen_width_px);
offset_row_px = (uint32_t)(offset / screen_width_px);
offset_col_px = (uint32_t)(offset % screen_width_px);
break;
default:
update_width_px = 0;
@ -723,7 +723,6 @@ bool SCSIPowerView::WriteFrameBuffer(const DWORD *cdb, const BYTE *buf, const DW
}
LOGTRACE("Calculate Offset: %u (%08X) Screen width: %u height: %u Update X: %u (%06X) Y: %u (%06X)", offset, offset, screen_width_px, screen_height_px, offset_row_px, offset_row_px, offset_col_px, offset_col_px);
LOGINFO("Update Width px: %d:%d (bytes: %d, %d)", update_width_px, update_height_px, update_width_x_bytes, update_height_y_bytes);
if(update_width_px == 0){
// This is some weird error condition. For now, just return.
@ -740,6 +739,14 @@ bool SCSIPowerView::WriteFrameBuffer(const DWORD *cdb, const BYTE *buf, const DW
return true;
}
// offset_row_px = (uint32_t)((offset) / screen_width_px)/2;
// offset_col_px = (uint32_t)(((offset)/2) % screen_width_px);
LOGDEBUG("Update Position: %d:%d Offset: %d Screen Width: %d Width px: %d:%d (bytes: %d, %d)", offset_col_px, offset_row_px, offset, screen_width_px, update_width_px, update_height_px, update_width_x_bytes, update_height_y_bytes);
// For each row
for (DWORD idx_row_y = 0; idx_row_y < (update_height_px); idx_row_y++){

2
src/raspberrypi/devices/scsi_powerview.h
View File

@ -45,7 +45,7 @@ private:
SASIDEV::ctrl_t *ctrl;
enum eColorDepth_t : uint16_t {eColorsNone=0x0001, eColorsBW=0x0002, eColors16=0x0010, eColors256=0x0100};
enum eColorDepth_t : uint16_t {eColorsNone=0x0000, eColorsBW=0x0001, eColors16=0x0010, eColors256=0x0100};
eColorDepth_t color_depth;