Update list of resources in ROM

Make/RISC.make

@@ -178,15 +178,11 @@ Features		=	hasRISCV0ResMgrPatches
 					hasFullKerning							¶
 					hasGlyphState							¶
 					hasPDMMaceEnet							¶
-					hasAppleTalkInROM						¶
 					hasMixedMode							¶
 					nonSerializedIO							¶
 					hasSCSIDiskModeFeature					¶
-					hasSysSevenResources					¶
-					hasDataAccessPACK						¶
 					hasCPUIDRegister						¶
 					has2MegROMOrMore						¶
-					hasVideoIn								¶
 					hasAsyncSCSI							¶
 					BadBlockSparingEnabled					¶
 					CubeE									¶
@@ -199,10 +195,8 @@ Features		=	hasRISCV0ResMgrPatches
 					forADBKeyboards 						¶
 					forAppleTalk20							¶
 					forLocalizability						¶
-					has040MMU								¶
 					hasADBKeyLayouts						¶
 					hasAliasMgr 							¶
-					hasApple2Fonts							¶
 					hasAppleEventMgr						¶
 					hasBalloonHelp							¶
 					hasBattery								¶
@@ -240,49 +234,31 @@ Features		=	hasRISCV0ResMgrPatches
 					ForROM
 
 
-ResourceFiles	=	"{RsrcDir}ATBoot.RSRC"					¶
+ResourceFiles	=	"{MiscDir}ATAMgr.rsrc"					¶
-					"{MiscDir}AppleTalk.ROM.rsrc"			¶
+					"{MiscDir}BCScreen.rsrc"				¶
-					"{RsrcDir}AppleEventMgr.rsrc"			¶
 					"{RsrcDir}CQD.rsrc"						¶
-					"{RsrcDir}ColorPicker.rsrc"				¶
-					"{RsrcDir}CommToolbox.rsrc"				¶
-					"{RsrcDir}ControlMgr.rsrc"				¶
-					"{RsrcDir}DataAccessMgr.rsrc"			¶
-					"{RsrcDir}DictionaryMgr.rsrc"			¶
 					"{RsrcDir}DeclData"						¶
+					"{MiscDir}DriverServices.rsrc"			¶
 					"{RsrcDir}EDisk.rsrc"					¶
-					"{RsrcDir}EditionMgr.rsrc"				¶
+					"{MiscDir}FireWire.rsrc"				¶
 					"{RsrcDir}Gibbly.rsrc"					¶
 					"{MiscDir}GoNativeResources"			¶
 					"{MiscDir}EmulatorAccelerations.rsrc"	¶
-					"{RsrcDir}HelpMgr.rsrc"					¶
+					"{MiscDir}LANDisk.rsrc"					¶
-					"{RsrcDir}InSane.rsrc"					¶
-					"{RsrcDir}I2CC.rsrc"					¶
-					"{RsrcDir}I2CT.rsrc"					¶
-					"{RsrcDir}ListMgr.rsrc"					¶
 					"{RsrcDir}MainCode.Rsrc"				¶
-					"{RsrcDir}MenuMgr.rsrc"					¶
+					"{MiscDir}MediaBay.rsrc"				¶
 					"{RsrcDir}MiscROMRsrcs.rsrc" 			¶
-					"{RsrcDir}NetBoot.rsrc"					¶
+					"{MiscDir}MultiprocessingServices.rsrc" ¶
-					"{RsrcDir}PDMENET.rsrc"					¶
+					"{MiscDir}NativeItt.rsrc" 				¶
-					"{RsrcDir}PPC.rsrc"						¶
+					"{MiscDir}NativeNub.rsrc" 				¶
-					"{RsrcDir}PictUtilities.rsrc"			¶
+					"{MiscDir}PCCard.rsrc" 					¶
-					"{RsrcDir}ROMApple2Fonts.rsrc"			¶
+					"{MiscDir}PowerMgr.rsrc" 				¶
 					"{RsrcDir}ROMFonts.rsrc" 				¶
 					"{RsrcDir}RomLayout.Rsrc"				¶
-					"{RsrcDir}SCCIOP.rsrc"					¶
-					"{RsrcDir}SWIMIOP.rsrc"					¶
 					"{RsrcDir}InSaneNFPU.rsrc" 				¶
-					"{RsrcDir}Sane.rsrc" 					¶
+					"{RsrcDir}SANE.rsrc" 					¶
-					"{RsrcDir}Serial.rsrc"					¶
+					"{MiscDir}SerialDMA.rsrc"				¶
-					"{RsrcDir}SerialDMA.rsrc"				¶
+					"{MiscDir}USB.rsrc"						¶
-					"{RsrcDir}Sony.rsrc" 					¶
-					"{RsrcDir}SoundMgr.rsrc" 				¶
-					"{RsrcDir}StandardFile.rsrc" 			¶
-					"{RsrcDir}VDigC.rsrc"					¶
-					"{RsrcDir}VDigT.rsrc"					¶
-					"{MiscDir}VM.RSRC"						¶
-					"{RsrcDir}WindowMgr.rsrc"				¶
 					"{RsrcDir}kbd.rsrc"
 
 
@@ -354,4 +330,4 @@ Clean
 
 #include {DeclDir}DeclData.make
 
-##include {ResourceDir}Resources.make
+#include {ResourceDir}Resources.make

Resources/RomResources.r

@@ -195,9 +195,6 @@ resource 'rrsc' (10, "Gibbly Guts") {
 	"Gibbly.rsrc",
 
 	{
-		'boot',
-		{ 3 };
-
 		'rovm',
 		{ 0 };
 	}
@@ -247,11 +244,21 @@ resource 'rrsc' (30, "kbd") {
 		'KCHR',
 		{ 0 };
 
+		'vadb',
+		{
+			0 /*ISO Cosmo*/,
+			1 /*JIS Cosmo*/,
+			2 /*ANSI Cosmo*/,
+			3 /*ISO Andy*/,
+			4 /*JIS Andy*/,
+			5 /*ANSI Andy*/
+		};
+
 		'KMAP',
-		{ 0, 2 };
+		{ 0, 2, 27, 198, 199, 200, 204, 205, 206 };
 
 		'KCAP',
-		{ 1,2,4,5 };
+		{ 1,2,4,5,14,16,17,198,199,200,204,205,206 };
 	}
 };
 
@@ -302,16 +309,7 @@ resource 'rrsc' (60, "MiscROMRsrcs") {
 
 	{
 		'accl',
-		{ 0, 1, 2, 3, 4, 5, 6, 7, 8 };
+		{ 0, 1, 2, 4, 5, 6, 7, 8, 9 };
-
-		'pslt',
-		{ gestaltQuadra950,
-		  gestaltPowerBookDuo210, gestaltPowerBookDuo230,
-		  gestaltCyclone33,    gestaltTempest33,
-		  gestaltCentris660AV, gestaltQuadra840AV, 
-		  gestaltPDM50WLCD,    gestaltPDM66WLCD, gestaltPDM80WLCD,
-		  gestaltPDM50L,       gestaltPDM66L,    gestaltPDM80L,
-		  gestaltPDM66F,       gestaltPDM80F,    gestaltPDM100F};
 
 		'ics#',
 		{ -16386 };
@@ -322,6 +320,9 @@ resource 'rrsc' (60, "MiscROMRsrcs") {
 		'ics8',
 		{ -16386 };
 
+		'cicn',
+		{ -20023, -20022, -20021, -20020 };
+
 		'clut',
 		{ 5, 9 };
 
@@ -549,18 +550,6 @@ resource 'rrsc' (200, "DataAccessMgr") {
 };
 
 
-resource 'rrsc' (500, "DictionaryMgr") {
-	kUniversal,
-	AllCombos,
-	{RsrcDir},
-	"DictionaryMgr.rsrc",
-
-	{
-		'dimg',
-		{ -16385 };
-	}
-};
-
 resource 'rrsc' (210, "HelpMgr") {
 	hasSysSevenResources,
 	AllCombos,
@@ -588,18 +577,6 @@ resource 'rrsc' (220, "PictUtilities") {
 	}
 };
 
-resource 'rrsc' (230, "Sony") {
-	kUniversal,
-	AllCombos,
-	{RsrcDir},
-	"Sony.rsrc",
-
-	{
-		'DRVR',
-		{ 4 };
-	}
-};
-
 resource 'rrsc' (240, "SCCIOP") {
 	hasIopScc,
 	AllCombos,
@@ -612,38 +589,14 @@ resource 'rrsc' (240, "SCCIOP") {
 	}
 };
 
-resource 'rrsc' (250, "Serial") {
+resource 'rrsc' (270, "SerialDMA") {
 	kUniversal,
 	AllCombos,
-	{RsrcDir},
+	{MiscDir},
-	"Serial.rsrc",
-
-	{
-		'SERD',									/* common IOP/Bypass serial driver */
-		{ 0 };
-	}
-};
-
-resource 'rrsc' (260, "SerialIOP") {
-	hasIopScc,
-	AllCombos,
-	{RsrcDir},
-	"Serial.rsrc",
-
-	{
-		'SERD',									/* port A, B IOP serial drivers */
-		{ 60, 61 };
-	}
-};
-
-resource 'rrsc' (270, "SerialDMA") {
-	hasPSC || hasAMIC,
-	AllCombos,
-	{RsrcDir},
 	"SerialDMA.rsrc",
 
 	{
-		'SERD',									/* universal driver */
+		'nsrd',
 		{ 1 };
 	}
 };
@@ -952,28 +905,6 @@ resource 'rrsc' (455, "I2CC") {
 	}
 };
 
-resource 'rrsc' (460, "Ethernet") {
-	kUniversal,
-	AllCombos,
-	{MiscDir},																					/* <LW18> */
-	"Ethernet.RSRC",
-
-	{
-/*		'DRVR',								DRVR from Ethernet.RSRC is out-of-date */
-/*		{ 127 };							We want the one from AppleTalk.ROM.RSRC */
-
-		'enet',								/* ENET Driver for LC Ethernet Card */
-		{ 46 };								/* ONLY in ROM to allow ELAN PSD enet card */
-											/* to work when netbooting, ie. before a system */
-											/* file is opened which has a good enet drvr in it,
-											/* on 030 cpus, LCII, etc. */
-
-		'ecfg',								    /* Enet Config resources for new Enet Driver */ /* <LW18> */
-		{ 19, 20, 22, 26, 27, 30, 35, 36,
-		  116,117,118,119,120,121,122,123};		/* Rsrc ID's are gestaltMachineType codes */	/* <LW18> */
-	}
-};
-
 resource 'rrsc' (461, "Ethernet2") {
 	hasMace,
 	AllCombos,
@@ -1011,95 +942,29 @@ resource 'rrsc' (480, "Backlight") {
 	}
 };
 
-// Sound Manager resources
+resource 'rrsc' (335, "LANDisk") {
-
-// sifter 'thng' resource IDs
-#define kRate8ResID				-16557
-#define kRate16ResID			-16558
-#define kConverterResID			-16559
-#define kSndSourceResID			-16560
-#define kMixerResID				-16561
-#define kASCResID				-16563
-#define kClassicResID			-16564
-#define kDSPResID				-16565
-#define kMace3ResID				-16566
-#define kMace6ResID				-16567
-#define kCDXAResID				-16576
-#define kAwacsResID				-16569
-#define kAwacsPhoneResID		-16570
-
-// component descriptor string IDs
-#define kRate8StringResID		-16577
-#define kRate16StringResID		-16578
-#define kConverterStringResID	-16579
-#define kSndSourceStringResID	-16580
-#define kMixerStringResID		-16581
-#define kASCStringResID			-16583
-#define kClassicStringResID		-16584
-#define kDSPStringResID			-16585
-#define kMace3StringResID		-16586
-#define kMace6StringResID		-16587
-#define kCDXAStringResID		-16588
-#define kAwacsStringResID		-16569
-#define kAwacsPhoneStringResID	-16571
-
-// sound 'proc' resource IDs
-#define kSoundInputResID		-16497
-#define kPlayFromDiskResID		-16498
-
-// Sound Manager resource IDs
-#define kMeterControlDefID		62
-#define kSoundDriverID			3
-#define kBatmanInputDriverID	-16499
-#define kAwacsInputDriverID		-16500
-#define kPreferenceNameID		-16568
-#define	iWrongOutputSampleRate	-16526
-
-resource 'rrsc' (490, "Sound") {
 	kUniversal,
 	AllCombos,
-	{RsrcDir},
+	{MiscDir},
-	"SoundMgr.rsrc",
+	"LANDisk.rsrc",
 
 	{
-		'CDEF',
+		'dfrg',
-		{ kMeterControlDefID };
+		{ -20722 };
-		
-		'DRVR',
-		{ kSoundDriverID,kBatmanInputDriverID,kAwacsInputDriverID };
-
-		'proc',
-		{ kPlayFromDiskResID, kSoundInputResID };
-
-		'sift',
-		{ kRate8ResID, kRate16ResID, kConverterResID, kSndSourceResID,
-		  kMixerResID, kASCResID, kMace3ResID, kAwacsResID };
-
-		'adio',
-		{ kAwacsPhoneResID };
-
-		'thng',
-		{ kRate8ResID, kRate16ResID, kConverterResID, kSndSourceResID,
-		  kMixerResID, kASCResID, kMace3ResID, kMace6ResID, kAwacsResID, kAwacsPhoneResID };
-
-		'ICON',
-		{ kRate8ResID, kSndSourceResID, kMixerResID, kASCResID, kAwacsPhoneResID };
-
-
-/* re: we'll leave these resources in here so sound will work without a gibbly. They'll be on */
-/* disk too.																				  */
-
-		'STR ',
-		{ kRate8ResID, kRate16ResID, kConverterResID, kSndSourceResID, kMixerResID,
-		  kASCResID, kMace3ResID, kMace6ResID, kPreferenceNameID, kRate8StringResID,
-		  kRate16StringResID, kConverterStringResID, kMixerStringResID, kASCStringResID,
-		  kMace3StringResID, kMace6StringResID, kAwacsStringResID, kAwacsPhoneResID,
-		  kAwacsPhoneStringResID };
 	}
 };
 
+resource 'rrsc' (435, "BCScreen") {
+	kUniversal,
+	AllCombos,
+	{MiscDir},
+	"BCScreen.rsrc",
 
-// End of SoundMgr items
+	{
+		'ndrv',
+		{ -16515 };
+	}
+};
 
 resource 'rrsc' (501, "EmulatorAccelerations") {
 	hasMixedMode,
@@ -1113,6 +978,20 @@ resource 'rrsc' (501, "EmulatorAccelerations") {
 	}
 };
 
+resource 'rrsc' (599, "Multiprocessing") {
+	hasMixedMode,
+	AllCombos,
+	{MiscDir},
+	"MultiprocessingServices.rsrc",
+
+	{
+		'ncod',
+		{ 2 /*MPLibrary*/ };
+		'nlib',
+		{ 3 /*MPSharedGlobals*/ };
+	}
+};
+
 resource 'rrsc' (502, "GoNative") {
 	hasMixedMode,
 	AllCombos,
@@ -1120,56 +999,176 @@ resource 'rrsc' (502, "GoNative") {
 	"GoNativeResources",
 
 	{
+		'cfrf',
+		{ 0 };
+
 		'ncod',
 		{ 0,1,8 };
 
 		'nlib',
-		{ 5,6,9,10,11,15,16,17,18,19,20 };
+		{
+			5 /*InterfaceLib*/,
+			6 /*PrivateInterfaceLib*/,
+			7 /*BootStdCLib*/,
+			8 /*MathLibGlobals*/,
+			9 /*MathLib*/,
+			10 /*StdCLib*/,
+			-16420 /*Math64Lib*/,
+			-20264 /*CursorDevicesLib*/
+		};
 	}
 };
 
-resource 'rrsc' (504, "Password") {
+/* everything after here is new */
-	kUnused,
+
+resource 'rrsc' (503, "DriverServices") {
+	hasMixedMode,
 	AllCombos,
-	{RsrcDir},
+	{MiscDir},
-	"MiscROMRsrcs.rsrc",
+	"DriverServices.rsrc",
 
 	{
-		'ICON',
+		'ntrb',
-		{29296}
+		{ -16400 /*NameRegistryTraps*/ };
+
+		'nlib',
+		{ -16400 /*NameRegistryLib*/, -16407 /*DSLGlobalsLib*/, -16401 /*DriverServicesLib*/, -16402 /*DriverLoaderLib*/, -16404 /*PCILib*/, -16403 /*VideoServicesLib*/, -16405 /*VideoServicesGlobals*/ };
 	}
 };
 
-resource 'rraa' (105, "TNT Boot beep") {
+resource 'rrsc' (504, "PowerMgr") {
-
+	kUniversal,
-	hasGrandCentral,
-
 	AllCombos,
+	{MiscDir},
+	"PowerMgr.rsrc",
 
-	{MiscDir},			/* Path Name */
+	{
+		'nlib',
+		{ -16411 /*PowerMgrLib*/ };
 
-	"BootBeep.rsrc",	/* File Name */
+		'scod',
-	
+		{ -20961, -20984 };
-	'beep',				/* Resource Type */  
+	}
-	
-	0x0000,				/* Resource ID */
-	
-	0x00200000			 /* ROM Address */
 };
 
-resource 'rraa' (110, "TNT error beep") {
+resource 'rrsc' (605, "ATA DRVRs") {
-
+	kUniversal,
-	hasGrandCentral,
-
 	AllCombos,
+	{MiscDir},
+	"ATAMgr.rsrc",
 
-	{MiscDir},			/* Path Name */
+	{
-	
+		'DRVR',
-	"ErrorBeep.rsrc",	/* File Name */
+		{ 53 /*.ATADisk*/, -20175 /*.ATALoad*/ };
-	
+	}
-	'beep',				/* Resource Type */  
+};
-	
+
-	0x0000,				/* Resource ID */
+resource 'rrsc' (607, "NativeNub -- for MacsBug?") {
-	
+	kUniversal,
-	0x00220000			 /* ROM Address */
+	AllCombos,
+	{MiscDir},
+	"NativeNub.rsrc",
+
+	{
+		'ncod',
+		{ 50 /*NativeNub*/ };
+	}
+};
+
+resource 'rrsc' (610, "NativeItt -- SCSI") {
+	kUniversal,
+	AllCombos,
+	{MiscDir},
+	"NativeItt.rsrc",
+
+	{
+		'nitt',
+		{ 43 /*Native 4.3*/ };
+		'gcko',
+		{ 43 /*Main*/ };
+	}
+};
+
+resource 'rrsc' (620, "PCCard") {
+	kUniversal,
+	AllCombos,
+	{MiscDir},
+	"PCCard.rsrc",
+
+	{
+		'ndrv',
+		{ -20166 /*DefaultPCCardEnabler*/, -20181 /*pccard-ata*/ };
+	}
+};
+
+resource 'rrsc' (630, "MediaBay") {
+	kUniversal,
+	AllCombos,
+	{MiscDir},
+	"MediaBay.rsrc",
+
+	{
+		'ndrv',
+		{ -20164 /*media-bay*/ };
+		'code',
+		{ -20164 /*Main*/ };
+	}
+};
+
+resource 'rrsc' (640, "ATAMgr") {
+	kUniversal,
+	AllCombos,
+	{MiscDir},
+	"ATAMgr.rsrc",
+
+	{
+		'nlib',
+		{ -20186 /*ATAManager*/ };
+	}
+};
+
+resource 'rrsc' (650, "USB") {
+	kUniversal,
+	AllCombos,
+	{MiscDir},
+	"USB.rsrc",
+
+	{
+		'nlib',
+		{ -20776 /*USBServicesLib*/, -20777 /*USBFamilyExpertLib*/, -20778 /*USBManagerLib*/ };
+		'ndrv',
+		{ -20776 /*pciclass,0c0310*/ };
+		'usbd',
+		{ -20776 /*USBHubDriver0*/, -20777 /*USBHubDriver1*/, -20778 /*USBHIDKeyboardModule*/, -20779 /*USBHIDMouseModule*/, -20780 /*USBCompositeDriver*/ };
+		'usbf',
+		{ -20776 };
+		'usbs',
+		{ -20781 /*USBShimKeyboard*/, -20782 /*USBShimMouse*/ };
+		'ndrv',
+		{ -20777 /*USBUnitTableStorageDriver*/ };
+		'usbs',
+		{ -20776 /*USBMassStorageLoader*/ };
+		'usbd',
+		{ -20781 /*USBMassStorageClassDriver*/, -20782 /*USBMassStorageVSDriver*/ };
+	}
+};
+
+resource 'rrsc' (660, "FireWire") {
+	kUniversal,
+	AllCombos,
+	{MiscDir},
+	"FireWire.rsrc",
+
+	{
+		'ndrv',
+		{ -21143 /*fw609e,10483*/ };
+		'fexp',
+		{ -21140 /*ComponentDriverExpert*/, -21141 /*GenericDriverFamilyExpert*/ };
+		'frag',
+		{ -21140 /*FWPCIScanner*/, -21141 /*FWExpertRegistration*/, -21142 /*sbp609e,104d8*/ };
+		'gpch',
+		{ 1207 /*Main*/ };
+		'ndrv',
+		{ -20994 /*sbp609e,104d8*/ };
+	}
 };