--- BasiliskII/src/slot_rom.cpp 2001/07/01 12:42:01 1.10 +++ BasiliskII/src/slot_rom.cpp 2002/04/25 11:00:30 1.14 @@ -1,7 +1,7 @@ /* * slot_rom.cpp - Slot declaration ROM * - * Basilisk II (C) 1996-2001 Christian Bauer + * Basilisk II (C) 1997-2002 Christian Bauer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,19 +46,6 @@ static uint32 p; static int slot_rom_size = 0; -// Check whether a mode with the specified depth exists -static bool has_depth(video_depth depth) -{ - vector::const_iterator i = VideoModes.begin(), end = VideoModes.end(); - while (i != end) { - if (i->depth == depth) - return true; - ++i; - } - return false; -} - - /* * Construct slot declaration ROM and copy it into the Mac ROM (must be called after VideoInit()) */ @@ -118,16 +105,18 @@ 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 monitor_desc &m, video_depth depth) { + const video_mode &mode = m.get_current_mode(); + uint32 ret = p; Long(50); // Length Long(0); // Base offset - Word(bytes_per_row); // Row bytes + Word(m.get_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 @@ -186,15 +175,64 @@ static uint32 VModeDesc(uint32 params, b return ret; } +static uint32 VMonitor(const monitor_desc &m, uint32 videoType, uint32 videoName, uint32 vidDrvrDir, uint32 gammaDir) +{ + uint32 minorBase, minorLength; + uint32 vidModeParms1, vidModeParms2, vidModeParms4, vidModeParms8, vidModeParms16, vidModeParms32; + uint32 vidMode1, vidMode2, vidMode4, vidMode8, vidMode16, vidMode32; + uint32 ret; + + minorBase = p; + Long(m.get_mac_frame_base()); // Frame buffer base + minorLength = p; + Long(0); // Frame buffer size (unspecified) + + vidModeParms1 = VModeParms(m, VDEPTH_1BIT); + vidModeParms2 = VModeParms(m, VDEPTH_2BIT); + vidModeParms4 = VModeParms(m, VDEPTH_4BIT); + vidModeParms8 = VModeParms(m, VDEPTH_8BIT); + vidModeParms16 = VModeParms(m, VDEPTH_16BIT); + vidModeParms32 = VModeParms(m, VDEPTH_32BIT); + + vidMode1 = VModeDesc(vidModeParms1, false); + vidMode2 = VModeDesc(vidModeParms2, false); + vidMode4 = VModeDesc(vidModeParms4, false); + vidMode8 = VModeDesc(vidModeParms8, false); + vidMode16 = VModeDesc(vidModeParms16, true); + vidMode32 = VModeDesc(vidModeParms32, true); + + ret = p; + Offs(0x01, videoType); // Video type descriptor + Offs(0x02, videoName); // Driver name + Offs(0x04, vidDrvrDir); // Driver directory + Rsrc(0x08, 0x4232); // Hardware device ID ('B2') + Offs(0x0a, minorBase); // Frame buffer base + Offs(0x0b, minorLength); // Frame buffer length + Offs(0x40, gammaDir); // Gamma directory + Rsrc(0x7d, 6); // Video attributes: Default to color, built-in + if (m.has_depth(VDEPTH_1BIT)) + Offs(m.depth_to_apple_mode(VDEPTH_1BIT), vidMode1); // Video mode parameters for 1 bit + if (m.has_depth(VDEPTH_2BIT)) + Offs(m.depth_to_apple_mode(VDEPTH_2BIT), vidMode2); // Video mode parameters for 2 bit + if (m.has_depth(VDEPTH_4BIT)) + Offs(m.depth_to_apple_mode(VDEPTH_4BIT), vidMode4); // Video mode parameters for 4 bit + if (m.has_depth(VDEPTH_8BIT)) + Offs(m.depth_to_apple_mode(VDEPTH_8BIT), vidMode8); // Video mode parameters for 8 bit + if (m.has_depth(VDEPTH_16BIT)) + Offs(m.depth_to_apple_mode(VDEPTH_16BIT), vidMode16); // Video mode parameters for 16 bit + if (m.has_depth(VDEPTH_32BIT)) + Offs(m.depth_to_apple_mode(VDEPTH_32BIT), vidMode32); // Video mode parameters for 32 bit + EndOfList(); + return ret; +} + bool InstallSlotROM(void) { uint32 boardType, boardName, vendorID, revLevel, partNum, date; uint32 vendorInfo, sRsrcBoard; - uint32 videoType, videoName, minorBase, minorLength, videoDrvr, vidDrvrDir; - uint32 defaultGamma, gammaDir, sRsrcVideo; - uint32 vidModeParms1, vidModeParms2, vidModeParms4, vidModeParms8, vidModeParms16, vidModeParms32; - uint32 vidMode1, vidMode2, vidMode4, vidMode8, vidMode16, vidMode32; + uint32 videoType, videoName, videoDrvr, vidDrvrDir; + uint32 defaultGamma, gammaDir; uint32 cpuType, cpuName, cpuMajor, cpuMinor, sRsrcCPU; @@ -202,7 +240,11 @@ bool InstallSlotROM(void) uint32 sRsrcDir; + vector::const_iterator m, mend = VideoMonitors.end(); + vector sRsrcVideo; + char str[256]; + int i; p = 0; // Board sResource @@ -234,15 +276,10 @@ bool InstallSlotROM(void) Offs(0x24, vendorInfo); // Vendor Info EndOfList(); - // Video sResource for default mode - videoType = p; // Literals + videoType = p; Word(3); Word(1); Word(1); Word(0x4232); // Display Video Apple 'B2' videoName = p; String("Display_Video_Apple_Basilisk"); - minorBase = p; - Long(VideoMonitor.mac_frame_base); // Frame buffer base - minorLength = p; - Long(0); // Frame buffer size (unspecified) videoDrvr = p; // Video driver Long(0x72); // Length @@ -315,42 +352,8 @@ 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); - - vidMode1 = VModeDesc(vidModeParms1, false); - vidMode2 = VModeDesc(vidModeParms2, false); - vidMode4 = VModeDesc(vidModeParms4, false); - vidMode8 = VModeDesc(vidModeParms8, false); - vidMode16 = VModeDesc(vidModeParms16, true); - vidMode32 = VModeDesc(vidModeParms32, true); - - sRsrcVideo = p; - Offs(0x01, videoType); // Video type descriptor - Offs(0x02, videoName); // Driver name - Offs(0x04, vidDrvrDir); // Driver directory - Rsrc(0x08, 0x4232); // Hardware device ID ('B2') - Offs(0x0a, minorBase); // Frame buffer base - 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 - EndOfList(); + for (m = VideoMonitors.begin(); m != mend; ++m) + sRsrcVideo.push_back(VMonitor(**m, videoType, videoName, vidDrvrDir, gammaDir)); // CPU sResource cpuType = p; // Literals @@ -428,7 +431,8 @@ bool InstallSlotROM(void) // sResource directory sRsrcDir = p; Offs(0x01, sRsrcBoard); - Offs(0x80, sRsrcVideo); + for (m = VideoMonitors.begin(), i = 0; m != mend; ++m, ++i) + Offs((*m)->get_slot_id(), sRsrcVideo[i]); Offs(0xf0, sRsrcCPU); Offs(0xf1, sRsrcEther); EndOfList(); @@ -463,7 +467,7 @@ void ChecksumSlotROM(void) p[slot_rom_size - 10] = 0; p[slot_rom_size - 9] = 0; uint32 crc = 0; - for (uint32 i=0; i> 31); crc += p[i]; }