Skip to content

Commit ccea8ae

Browse files
joevtdingusdev
authored andcommitted
Fix spelling of NuBus.
1 parent 6664219 commit ccea8ae

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

devices/common/machineid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
4040
*/
4141

4242
/**
43-
Machine ID register for Nubus Power Macs.
43+
Machine ID register for NuBus Power Macs.
4444
It's located at physical address 0x5FFFFFFC and contains four bytes:
4545
+0 uint16_t signature = 0xA55A
4646
+1 uint8_t machine_type (3 - Power Mac)

devices/ioctrl/amic.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ enum : uint64_t {
7070
/** Slot interrupt flag/enable register bits. */
7171
enum : uint64_t {
7272
SLOT_INT_SHIFT = 16,
73-
SLOT_INT_SLOT_0 = 1 << 2, // (R) ColdFusion Nubus slot 0 interrupt
74-
SLOT_INT_SLOT_1 = 1 << 3, // (R) ColdFusion Nubus slot 1 interrupt
75-
SLOT_INT_SLOT_2 = 1 << 4, // (R) ColdFusion Nubus slot 2 interrupt
73+
SLOT_INT_SLOT_0 = 1 << 2, // (R) ColdFusion NuBus slot 0 interrupt
74+
SLOT_INT_SLOT_1 = 1 << 3, // (R) ColdFusion NuBus slot 1 interrupt
75+
SLOT_INT_SLOT_2 = 1 << 4, // (R) ColdFusion NuBus slot 2 interrupt
7676
SLOT_INT_SLOT_VDS = 1 << 5, // (R) ColdFusion video direct slot interrupt
7777
SLOT_INT_SLOT_PDS = 1 << 5, // (R) PDM processor direct slot interrupt
7878
SLOT_INT_VBL = 1 << 6, // (R) built-in video VBL interrupt

devices/sound/awacs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
2222
/** AWAC sound device emulation.
2323
2424
Currently supported audio codecs:
25-
- PDM AWACs in Nubus Power Macintosh models
25+
- PDM AWACs in NuBus Power Macintosh models
2626
- Screamer AWACs in Beige G3
2727
*/
2828

machines/machinefactory.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ typedef struct {
6060
uint32_t ow_expected_checksum;
6161
uint32_t nw_product_id;
6262
uint32_t nw_subconfig_expected_checksum; // checksum of the system config section but without the firmware version and date
63-
const char *id_str; // Bootstrap string located at offset 0x30D064 (PCI Macs) or 0x30C064 (Nubus Macs)
63+
const char *id_str; // Bootstrap string located at offset 0x30D064 (PCI Macs) or 0x30C064 (NuBus Macs)
6464
const char *nw_firmware_updater_name;
6565
const char *nw_openfirmware_name;
6666
const char *dppc_machine;
@@ -109,10 +109,10 @@ static rom_info rom_identity[] = {
109109
{ 0x067c32f2, 1024, 0x064dc91d, 0, 0, nullptr , 0, 0, nullptr , nullptr , "Performa 580 & 588" },
110110
{ 0x077d10f3, 2048, 0x5bf10fd1, 0, 0, nullptr , 0, 0, nullptr , nullptr , "Quadra 660av & 840av" },
111111

112-
{ 0x077d20f2, 4096, 0x9feb69b3, 0, 0, "Boot PDM 601 1.0", 0, 0, "pm6100" , "Nubus Power Mac" , "Power Mac 6100 & 7100 & 8100" }, // Piltdown Man
113-
{ 0x077d22f1, 4096, 0x9c7c98f7, 0, 0, "Boot PDM 601 1.0", 0, 0, "pm9150" , "Nubus Power Mac" , "Workgroup Server 9150-80" }, // Piltdown Man
114-
{ 0x077d23f1, 4096, 0x9b7a3aad, 0, 0, "Boot PDM 601 1.1", 0, 0, "pm7100" , "Nubus Power Mac" , "Power Mac 7100 (newer)" }, // Piltdown Man
115-
{ 0x077d25f1, 4096, 0x9b037f6f, 0, 0, "Boot PDM 601 1.1", 0, 0, "pm9150" , "Nubus Power Mac" , "Workgroup Server 9150-120" }, // Piltdown Man
112+
{ 0x077d20f2, 4096, 0x9feb69b3, 0, 0, "Boot PDM 601 1.0", 0, 0, "pm6100" , "NuBus Power Mac" , "Power Mac 6100 & 7100 & 8100" }, // Piltdown Man
113+
{ 0x077d22f1, 4096, 0x9c7c98f7, 0, 0, "Boot PDM 601 1.0", 0, 0, "pm9150" , "NuBus Power Mac" , "Workgroup Server 9150-80" }, // Piltdown Man
114+
{ 0x077d23f1, 4096, 0x9b7a3aad, 0, 0, "Boot PDM 601 1.1", 0, 0, "pm7100" , "NuBus Power Mac" , "Power Mac 7100 (newer)" }, // Piltdown Man
115+
{ 0x077d25f1, 4096, 0x9b037f6f, 0, 0, "Boot PDM 601 1.1", 0, 0, "pm9150" , "NuBus Power Mac" , "Workgroup Server 9150-120" }, // Piltdown Man
116116
{ 0x077d26f1, 4096, 0x63abfd3f, 0, 0, "Boot Cordyceps 6", 0, 0, "pm5200" , "Power Mac 5200/6200 series" , "Power Mac & Performa 5200,5300,6200,6300" }, // Cordyceps
117117
{ 0x077d28a5, 4096, 0x67a1aa96, 0, 0, "..0.....Boot TNT", 0, 0, nullptr , nullptr , "TNT A5c1" },
118118
{ 0x077d28f1, 4096, 0x96cd923d, 0, 0, "Boot TNT 0.1p..]", 0, 0, "pm7200" , "Power Mac 7xxxx/8xxx series", "Power Mac 7200&7500&8500&9500 v1" }, // TNT Trinitrotoluene

0 commit comments

Comments
 (0)