--- BasiliskII/src/slot_rom.cpp	2001/06/28 21:36:46	1.8
+++ BasiliskII/src/slot_rom.cpp	2001/07/03 19:20:38	1.11
@@ -42,18 +42,8 @@ static uint8 srom[4096];
 // Index in srom
 static uint32 p;
 
-
-// Check whether a mode with the specified depth exists
-static bool has_depth(video_depth depth)
-{
-	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
-	while (i != end) {
-		if (i->depth == depth)
-			return true;
-		++i;
-	}
-	return false;
-}
+// Length of slot ROM
+static int slot_rom_size = 0;
 
 
 /*
@@ -115,16 +105,16 @@ static void PString(char *str)
 		srom[p++] = 0;
 }
 
-static uint32 VModeParms(uint32 width, uint32 height, uint32 bytes_per_row, video_depth depth)
+static uint32 VModeParms(const video_mode &mode, video_depth depth)
 {
 	uint32 ret = p;
 	Long(50);					// Length
 	Long(0);					// Base offset
-	Word(bytes_per_row);		// Row bytes
+	Word(video_bytes_per_row(depth, mode.resolution_id));
 	Word(0);					// Bounds
 	Word(0);
-	Word(height);
-	Word(width);
+	Word(mode.y);
+	Word(mode.x);
 	Word(0);					// Version
 	Word(0);					// Pack type
 	Long(0);					// Pack size
@@ -312,12 +302,12 @@ bool InstallSlotROM(void)
 	Offs(0x80, defaultGamma);
 	EndOfList();
 
-	vidModeParms1 = VModeParms(VideoMonitor.mode.x, VideoMonitor.mode.y, VideoMonitor.mode.bytes_per_row, VDEPTH_1BIT);
-	vidModeParms2 = VModeParms(VideoMonitor.mode.x, VideoMonitor.mode.y, VideoMonitor.mode.bytes_per_row, VDEPTH_2BIT);
-	vidModeParms4 = VModeParms(VideoMonitor.mode.x, VideoMonitor.mode.y, VideoMonitor.mode.bytes_per_row, VDEPTH_4BIT);
-	vidModeParms8 = VModeParms(VideoMonitor.mode.x, VideoMonitor.mode.y, VideoMonitor.mode.bytes_per_row, VDEPTH_8BIT);
-	vidModeParms16 = VModeParms(VideoMonitor.mode.x, VideoMonitor.mode.y, VideoMonitor.mode.bytes_per_row, VDEPTH_16BIT);
-	vidModeParms32 = VModeParms(VideoMonitor.mode.x, VideoMonitor.mode.y, VideoMonitor.mode.bytes_per_row, VDEPTH_32BIT);
+	vidModeParms1 = VModeParms(VideoMonitor.mode, VDEPTH_1BIT);
+	vidModeParms2 = VModeParms(VideoMonitor.mode, VDEPTH_2BIT);
+	vidModeParms4 = VModeParms(VideoMonitor.mode, VDEPTH_4BIT);
+	vidModeParms8 = VModeParms(VideoMonitor.mode, VDEPTH_8BIT);
+	vidModeParms16 = VModeParms(VideoMonitor.mode, VDEPTH_16BIT);
+	vidModeParms32 = VModeParms(VideoMonitor.mode, VDEPTH_32BIT);
 
 	vidMode1 = VModeDesc(vidModeParms1, false);
 	vidMode2 = VModeDesc(vidModeParms2, false);
@@ -335,18 +325,18 @@ bool InstallSlotROM(void)
 	Offs(0x0b, minorLength);			// Frame buffer length
 	Offs(0x40, gammaDir);				// Gamma directory
 	Rsrc(0x7d, 6);						// Video attributes: Default to color, built-in
-	if (has_depth(VDEPTH_1BIT))
-		Offs(0x80, vidMode1);			// Video mode parameters for 1 bit
-	if (has_depth(VDEPTH_2BIT))
-		Offs(0x81, vidMode2);			// Video mode parameters for 2 bit
-	if (has_depth(VDEPTH_4BIT))
-		Offs(0x82, vidMode4);			// Video mode parameters for 4 bit
-	if (has_depth(VDEPTH_8BIT))
-		Offs(0x83, vidMode8);			// Video mode parameters for 8 bit
-	if (has_depth(VDEPTH_16BIT))
-		Offs(0x84, vidMode16);			// Video mode parameters for 16 bit
-	if (has_depth(VDEPTH_32BIT))
-		Offs(0x85, vidMode32);			// Video mode parameters for 32 bit
+	if (video_has_depth(VDEPTH_1BIT))
+		Offs(DepthToAppleMode(VDEPTH_1BIT), vidMode1);		// Video mode parameters for 1 bit
+	if (video_has_depth(VDEPTH_2BIT))
+		Offs(DepthToAppleMode(VDEPTH_2BIT), vidMode2);		// Video mode parameters for 2 bit
+	if (video_has_depth(VDEPTH_4BIT))
+		Offs(DepthToAppleMode(VDEPTH_4BIT), vidMode4);		// Video mode parameters for 4 bit
+	if (video_has_depth(VDEPTH_8BIT))
+		Offs(DepthToAppleMode(VDEPTH_8BIT), vidMode8);		// Video mode parameters for 8 bit
+	if (video_has_depth(VDEPTH_16BIT))
+		Offs(DepthToAppleMode(VDEPTH_16BIT), vidMode16);	// Video mode parameters for 16 bit
+	if (video_has_depth(VDEPTH_32BIT))
+		Offs(DepthToAppleMode(VDEPTH_32BIT), vidMode32);	// Video mode parameters for 32 bit
 	EndOfList();
 
 	// CPU sResource
@@ -433,23 +423,39 @@ bool InstallSlotROM(void)
 	// Format/header block
 	Offs(0, sRsrcDir);					// sResource directory
 	Long(p + 16);						// Length of declaration data
-	Long(0);							// CRC (calculated below)
+	Long(0);							// CRC (calculated later)
 	Word(0x0101);						// Rev. level, format
 	Long(0x5a932bc7);					// Test pattern
 	Word(0x000f);						// Byte lanes
 
+	// Copy slot ROM to Mac ROM
+	slot_rom_size = p;
+	memcpy(ROMBaseHost + ROMSize - slot_rom_size, srom, slot_rom_size);
+
+	// Calculate checksum
+	ChecksumSlotROM();
+	return true;
+}
+
+/*
+ *  Calculate slot ROM checksum (in-place)
+ */
+
+void ChecksumSlotROM(void)
+{
 	// Calculate CRC
+	uint8 *p = ROMBaseHost + ROMSize - slot_rom_size;
+	p[slot_rom_size - 12] = 0;
+	p[slot_rom_size - 11] = 0;
+	p[slot_rom_size - 10] = 0;
+	p[slot_rom_size - 9] = 0;
 	uint32 crc = 0;
-	for (uint32 i=0; i<p; i++) {
+	for (uint32 i=0; i<slot_rom_size; i++) {
 		crc = (crc << 1) | (crc >> 31);
-		crc += srom[i];
+		crc += p[i];
 	}
-	srom[p - 12] = crc >> 24;
-	srom[p - 11] = crc >> 16;
-	srom[p - 10] = crc >> 8;
-	srom[p - 9] = crc;
-
-	// Copy slot ROM to Mac ROM
-	memcpy(ROMBaseHost + ROMSize - p, srom, p);
-	return true;
+	p[slot_rom_size - 12] = crc >> 24;
+	p[slot_rom_size - 11] = crc >> 16;
+	p[slot_rom_size - 10] = crc >> 8;
+	p[slot_rom_size - 9] = crc;
 }