Inital changes for new USB map

Resources/Constants.py

@@ -97,6 +97,10 @@ class Constants:
     def kexts_path(self): return self.oc_folder / Path("Kexts")
     @property
     def resources_path(self): return self.oc_folder / Path("Resources")
+    @property
+    def map_kext_folder(self): return self.kexts_path / Path("USB-Map.kext")
+    @property
+    def map_contents_folder(self): return self.map_kext_folder / Path("Contents")
 
     # Tools
     @property

Resources/ModelArray.py

@@ -483,3 +483,79 @@ MacPro71 = [
     "MacPro5,1",
     "Xserve3,1"
 ]
+
+# Maps
+
+XXerve = [
+    "Xserve3,1",
+]
+
+iXac = [
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+    "iMac10,1",
+    "iMac11,1",
+    "iMac11,2",
+    "iMac11,3",
+    "iMac12,1",
+    "iMac12,2",
+    "iMac13,1",
+    "iMac13,2",
+    "iMac14,1",
+    "iMac14,2",
+    "iMac14,3",
+]
+
+XacBookNormal = [
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBook6,1",
+    "MacBook7,1",
+]
+
+XacBookAir = [
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
+    "MacBookAir4,1",
+    "MacBookAir4,2",
+    "MacBookAir5,1",
+    "MacBookAir5,2",
+]
+
+XacBookPro = [
+    "MacBookPro3,1",
+    "MacBookPro4,1",
+    "MacBookPro5,1",
+    "MacBookPro5,2",
+    "MacBookPro5,3",
+    "MacBookPro5,4",
+    "MacBookPro5,5",
+    "MacBookPro6,1",
+    "MacBookPro6,2",
+    "MacBookPro7,1",
+    "MacBookPro8,1",
+    "MacBookPro8,2",
+    "MacBookPro8,3",
+    "MacBookPro9,1",
+    "MacBookPro9,2",
+    "MacBookPro10,1",
+    "MacBookPro10,2",
+]
+
+XacPro = [
+    "MacPro3,1",
+    "MacPro4,1",
+    "MacPro5,1",
+]
+
+Xacmini = [
+    "Macmini3,1",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
+    "Macmini6,1",
+    "Macmini6,2",
+]

Resources/build.py

@@ -122,15 +122,12 @@ class BuildOpenCore:
             print("- Adding SSDT-CPBG.aml")
             self.get_item_by_kv(self.config["ACPI"]["Add"], "Path", "SSDT-CPBG.aml")["Enabled"] = True
 
-        # USB map
+        usb_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Maps/Universal/Info.plist")
-        map_name = f"USB-Map-{self.model}.zip"
-        map_entry = f"USB-Map-{self.model}.kext"
-        usb_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Maps/Zip/{map_name}")
         if usb_map_path.exists():
-            print(f"- Adding {map_entry}")
+            print(f"- Adding USB-Map.kext")
-            shutil.copy(usb_map_path, self.constants.kexts_path)
+            Path(self.constants.map_kext_folder).mkdir()
-            self.get_kext_by_bundle_path("USB-Map-SMBIOS.kext")["Enabled"] = True
+            Path(self.constants.map_contents_folder).mkdir()
-            self.get_kext_by_bundle_path("USB-Map-SMBIOS.kext")["BundlePath"] = map_entry
+            shutil.copy(usb_map_path, self.constants.map_contents_folder)
 
         if self.model in ModelArray.DualGPUPatch:
             print("- Adding dual GPU patch")