Partially revert https://github.com/vitasdk/vita-headers/pull/410

This pull request introduced some breaking changes.

3 files changed, 144 insertions, 144 deletions

diff --git a/nids/360/SceAppMgr.yml b/nids/360/SceAppMgr.yml
index 140a039..9abb455 100644
--- a/nids/360/SceAppMgr.yml
+++ b/nids/360/SceAppMgr.yml
@@ -253,6 +253,137 @@ modules:
           sceAppMgrUmount: 0xA714BB35
           sceAppMgrUpdateRifInfo: 0x894BDCB8
           sceAppMgrWorkDirMount: 0x3A0A9B82
+      SceAppMgrUser:
+        nid: 0xA6605D6F
+        functions:
+          _sceAppMgrGetAppState: 0x5E86319A
+          sceAppMgrAcidDirSet: 0x31EFA73A
+          sceAppMgrAcquireSoundOutExclusive3: 0xD97AC34E
+          sceAppMgrAddContAddMount: 0x2B40BA12
+          sceAppMgrAddContMount: 0x553AA57B
+          sceAppMgrAppDataMount: 0x291AFBDC
+          sceAppMgrAppDataMountById: 0xE8BD32BD
+          sceAppMgrAppMount: 0x127F3BEB
+          sceAppMgrAppParamGetInt: 0x9E57853D
+          sceAppMgrAppParamGetString: 0x0C733AE2
+          sceAppMgrAppParamSetString: 0x5B07C10B
+          sceAppMgrAppUmount: 0x9619C150
+          sceAppMgrBgdlGetQueueStatus: 0x7BC8D5B6
+          sceAppMgrCaptureFrameBufDMACByAppId: 0x44F8347C
+          sceAppMgrCaptureFrameBufIFTUByAppId: 0x8C24D566
+          sceAppMgrCheckRifGD: 0x6E5CBCA2
+          sceAppMgrContentInstallPeriodStart: 0x251A224D
+          sceAppMgrContentInstallPeriodStop: 0xB3DFC681
+          sceAppMgrConvertVs0UserDrivePath: 0xADAA658E
+          sceAppMgrDeclareShellProcess2: 0xF261879F
+          sceAppMgrDestroyAppByName: 0x4570DC15
+          sceAppMgrDrmClose: 0x29293B46
+          sceAppMgrDrmOpen: 0xD43FDF20
+          sceAppMgrForceUmount: 0x54AD0F7F
+          sceAppMgrGameDataMount: 0x4993876C
+          sceAppMgrGetAppInfo: 0x72ABDC61
+          sceAppMgrGetAppMgrState: 0x98724E3F
+          sceAppMgrGetAppParam: 0x9B2422E0
+          sceAppMgrGetAppParam2: 0x3D816DFA
+          sceAppMgrGetBootParam: 0x73E5D57D
+          sceAppMgrGetBudgetInfo: 0x5F00F261
+          sceAppMgrGetCoredumpStateForShell: 0x27CEDB95
+          sceAppMgrGetCurrentBgmState: 0xACB3826A
+          sceAppMgrGetCurrentBgmState2: 0x62BEBD65
+          sceAppMgrGetDevInfo: 0x67705391
+          sceAppMgrGetFgAppInfo: 0x59F8C1C1
+          sceAppMgrGetIdByName: 0x79F9E63A
+          sceAppMgrGetMediaTypeFromDrive: 0xC014AA52
+          sceAppMgrGetMediaTypeFromDriveByPid: 0x8F6213CA
+          sceAppMgrGetMountProcessNum: 0x43558909
+          sceAppMgrGetNameById: 0xF4D6AE3A
+          sceAppMgrGetPfsDrive: 0x139D9D93
+          sceAppMgrGetPidListForShell: 0x970FA364
+          sceAppMgrGetRawPath: 0x0E8D27E8
+          sceAppMgrGetRawPathOfApp0ByAppIdForShell: 0x81D8D15D
+          sceAppMgrGetRawPathOfApp0ByPidForShell: 0x0B79E4BB
+          sceAppMgrGetRecommendedScreenOrientation: 0x8A1A6FFC
+          sceAppMgrGetRunningAppIdListForShell: 0x613A70E2
+          sceAppMgrGetSaveDataInfo: 0x6EF25378
+          sceAppMgrGetSaveDataInfoForSpecialExport: 0xC80E4B0F
+          sceAppMgrGetStatusByAppId: 0x47958DE5
+          sceAppMgrGetStatusById: 0x143EA292
+          sceAppMgrGetStatusByName: 0x656E0ABD
+          sceAppMgrGetSystemDataFilePlayReady: 0x1E1E97EE
+          sceAppMgrGetUserDirPath: 0x5253338C
+          sceAppMgrGetUserDirPathById: 0x63E51420
+          sceAppMgrGetVs0UserDataDrive: 0xC0631748
+          sceAppMgrGetVs0UserModuleDrive: 0x906154DE
+          sceAppMgrInitSafeMemoryById: 0x3E53681A
+          sceAppMgrInstallDirMount: 0x34003AFC
+          sceAppMgrIsCameraActive: 0x8B123D24
+          sceAppMgrLaunchAppByName: 0xC9C77E21
+          sceAppMgrLaunchAppByName2: 0x42945D67
+          sceAppMgrLaunchAppByName2ForShell: 0x6412F2D4
+          sceAppMgrLaunchAppByName2ndStage: 0xADAC0E8D
+          sceAppMgrLaunchAppByNameForShell: 0xA1D43805
+          sceAppMgrLaunchAppByPath4: 0xCECFC7CB
+          sceAppMgrLaunchAppByUri: 0x003C634F
+          sceAppMgrLaunchAppByUri2: 0x0ED6AF54
+          sceAppMgrLaunchVideoStreamingApp: 0x4C02B889
+          sceAppMgrLoadExec: 0xE6774ABC
+          sceAppMgrLoadSaveDataSystemFile: 0x660B57BE
+          sceAppMgrLoopBackFormat: 0xCE8CE150
+          sceAppMgrLoopBackMount: 0x33CD76DD
+          sceAppMgrMmsMount: 0xF4730BA8
+          sceAppMgrOverwriteLaunchParamForShell: 0xEC1FDACE
+          sceAppMgrPeekLaunchParamForShell: 0x6AD619D3
+          sceAppMgrPhotoMount: 0xF71CC393
+          sceAppMgrPhotoUmount: 0x3F1A3AEC
+          sceAppMgrPspSaveDataGetParams: 0xCF58EEE4
+          sceAppMgrPspSaveDataRead: 0x33C47470
+          sceAppMgrPspSaveDataRootMount: 0xC94B7E24
+          sceAppMgrReceiveEvent: 0xCFAD5A3A
+          sceAppMgrReceiveEventNum: 0x47E5DD7D
+          sceAppMgrReceiveNotificationRequestForShell: 0xF0DFB1EF
+          sceAppMgrReceiveShellEvent: 0x15AC8C52
+          sceAppMgrReceiveSystemEvent: 0x10B5765F
+          sceAppMgrSaveDataAddMount: 0x8B224917
+          sceAppMgrSaveDataDataRemove: 0x4544FCC5
+          sceAppMgrSaveDataDataRemove2: 0x36040E1D
+          sceAppMgrSaveDataDataSave: 0x84DE76C7
+          sceAppMgrSaveDataDataSave2: 0xD5CA4F56
+          sceAppMgrSaveDataGetQuota: 0x0717E2AE
+          sceAppMgrSaveDataMount: 0x31F3CC59
+          sceAppMgrSaveDataSlotCreate: 0x5181D7B3
+          sceAppMgrSaveDataSlotDelete: 0x6B0E7CF0
+          sceAppMgrSaveDataSlotFileClose: 0xFD7A4EEC
+          sceAppMgrSaveDataSlotFileGetParam: 0xC176317B
+          sceAppMgrSaveDataSlotFileOpen: 0x91BE107E
+          sceAppMgrSaveDataSlotGetParam: 0x17653D70
+          sceAppMgrSaveDataSlotGetStatus: 0x1F3A2F25
+          sceAppMgrSaveDataSlotInit: 0x4F8A92F1
+          sceAppMgrSaveDataSlotSetParam: 0xA8065FA4
+          sceAppMgrSaveDataSlotSetStatus: 0x3FD3073C
+          sceAppMgrSaveDataUmount: 0x8F513CF5
+          sceAppMgrSendNotificationRequest: 0x6E4997D7
+          sceAppMgrSendParam: 0xBB41230E
+          sceAppMgrSendSystemEvent: 0x2E4E1A1E
+          sceAppMgrSendSystemEvent2: 0xAEF9DF01
+          sceAppMgrSetBackRenderPortOwner: 0x7149016E
+          sceAppMgrSetBgmProxyApp: 0xC42F41E9
+          sceAppMgrSetNetworkDisconnectionWarningDialogState: 0xE352B29C
+          sceAppMgrSetPowerSaveMode: 0x2CF000BD
+          sceAppMgrSetRecommendedScreenOrientationForShell: 0x219043FF
+          sceAppMgrSetShellScreenOrientation: 0x5C7BE748
+          sceAppMgrSetSystemDataFile: 0x345F5CC0
+          sceAppMgrSetSystemDataFilePlayReady: 0x442ADA77
+          sceAppMgrSystemParamDateTimeGetConf: 0xE39FC7D5
+          sceAppMgrSystemParamGetInt: 0x5B75180C
+          sceAppMgrSystemParamGetString: 0x09899A08
+          sceAppMgrThemeDataMount: 0x633A7594
+          sceAppMgrTrophyMount: 0x84FE08EE
+          sceAppMgrTrophyMountById: 0x316207F3
+          sceAppMgrUmount: 0x5E375921
+          sceAppMgrUmountByPid: 0x919FDAE7
+          sceAppMgrUpdateSaveDataParam: 0x1B0BD20D
+          sceAppMgrWorkDirMount: 0x9B3BB24D
+          sceAppMgrWorkDirMountById: 0x80E86E42
       SceSharedFb:
         nid: 0x32A0442E
         functions:
diff --git a/nids/360/SceDriverUser.yml b/nids/360/SceDriverUser.yml
index 9f224b3..1d95a43 100644
--- a/nids/360/SceDriverUser.yml
+++ b/nids/360/SceDriverUser.yml
@@ -2,137 +2,6 @@ modules:
   SceDriverUser:
     nid: 0xAD0AEA9A
     libraries:
-      SceAppMgrUser:
-        nid: 0xA6605D6F
-        functions:
-          _sceAppMgrGetAppState: 0x5E86319A
-          sceAppMgrAcidDirSet: 0x31EFA73A
-          sceAppMgrAcquireSoundOutExclusive3: 0xD97AC34E
-          sceAppMgrAddContAddMount: 0x2B40BA12
-          sceAppMgrAddContMount: 0x553AA57B
-          sceAppMgrAppDataMount: 0x291AFBDC
-          sceAppMgrAppDataMountById: 0xE8BD32BD
-          sceAppMgrAppMount: 0x127F3BEB
-          sceAppMgrAppParamGetInt: 0x9E57853D
-          sceAppMgrAppParamGetString: 0x0C733AE2
-          sceAppMgrAppParamSetString: 0x5B07C10B
-          sceAppMgrAppUmount: 0x9619C150
-          sceAppMgrBgdlGetQueueStatus: 0x7BC8D5B6
-          sceAppMgrCaptureFrameBufDMACByAppId: 0x44F8347C
-          sceAppMgrCaptureFrameBufIFTUByAppId: 0x8C24D566
-          sceAppMgrCheckRifGD: 0x6E5CBCA2
-          sceAppMgrContentInstallPeriodStart: 0x251A224D
-          sceAppMgrContentInstallPeriodStop: 0xB3DFC681
-          sceAppMgrConvertVs0UserDrivePath: 0xADAA658E
-          sceAppMgrDeclareShellProcess2: 0xF261879F
-          sceAppMgrDestroyAppByName: 0x4570DC15
-          sceAppMgrDrmClose: 0x29293B46
-          sceAppMgrDrmOpen: 0xD43FDF20
-          sceAppMgrForceUmount: 0x54AD0F7F
-          sceAppMgrGameDataMount: 0x4993876C
-          sceAppMgrGetAppInfo: 0x72ABDC61
-          sceAppMgrGetAppMgrState: 0x98724E3F
-          sceAppMgrGetAppParam: 0x9B2422E0
-          sceAppMgrGetAppParam2: 0x3D816DFA
-          sceAppMgrGetBootParam: 0x73E5D57D
-          sceAppMgrGetBudgetInfo: 0x5F00F261
-          sceAppMgrGetCoredumpStateForShell: 0x27CEDB95
-          sceAppMgrGetCurrentBgmState: 0xACB3826A
-          sceAppMgrGetCurrentBgmState2: 0x62BEBD65
-          sceAppMgrGetDevInfo: 0x67705391
-          sceAppMgrGetFgAppInfo: 0x59F8C1C1
-          sceAppMgrGetIdByName: 0x79F9E63A
-          sceAppMgrGetMediaTypeFromDrive: 0xC014AA52
-          sceAppMgrGetMediaTypeFromDriveByPid: 0x8F6213CA
-          sceAppMgrGetMountProcessNum: 0x43558909
-          sceAppMgrGetNameById: 0xF4D6AE3A
-          sceAppMgrGetPfsDrive: 0x139D9D93
-          sceAppMgrGetPidListForShell: 0x970FA364
-          sceAppMgrGetRawPath: 0x0E8D27E8
-          sceAppMgrGetRawPathOfApp0ByAppIdForShell: 0x81D8D15D
-          sceAppMgrGetRawPathOfApp0ByPidForShell: 0x0B79E4BB
-          sceAppMgrGetRecommendedScreenOrientation: 0x8A1A6FFC
-          sceAppMgrGetRunningAppIdListForShell: 0x613A70E2
-          sceAppMgrGetSaveDataInfo: 0x6EF25378
-          sceAppMgrGetSaveDataInfoForSpecialExport: 0xC80E4B0F
-          sceAppMgrGetStatusByAppId: 0x47958DE5
-          sceAppMgrGetStatusById: 0x143EA292
-          sceAppMgrGetStatusByName: 0x656E0ABD
-          sceAppMgrGetSystemDataFilePlayReady: 0x1E1E97EE
-          sceAppMgrGetUserDirPath: 0x5253338C
-          sceAppMgrGetUserDirPathById: 0x63E51420
-          sceAppMgrGetVs0UserDataDrive: 0xC0631748
-          sceAppMgrGetVs0UserModuleDrive: 0x906154DE
-          sceAppMgrInitSafeMemoryById: 0x3E53681A
-          sceAppMgrInstallDirMount: 0x34003AFC
-          sceAppMgrIsCameraActive: 0x8B123D24
-          sceAppMgrLaunchAppByName: 0xC9C77E21
-          sceAppMgrLaunchAppByName2: 0x42945D67
-          sceAppMgrLaunchAppByName2ForShell: 0x6412F2D4
-          sceAppMgrLaunchAppByName2ndStage: 0xADAC0E8D
-          sceAppMgrLaunchAppByNameForShell: 0xA1D43805
-          sceAppMgrLaunchAppByPath4: 0xCECFC7CB
-          sceAppMgrLaunchAppByUri: 0x003C634F
-          sceAppMgrLaunchAppByUri2: 0x0ED6AF54
-          sceAppMgrLaunchVideoStreamingApp: 0x4C02B889
-          sceAppMgrLoadExec: 0xE6774ABC
-          sceAppMgrLoadSaveDataSystemFile: 0x660B57BE
-          sceAppMgrLoopBackFormat: 0xCE8CE150
-          sceAppMgrLoopBackMount: 0x33CD76DD
-          sceAppMgrMmsMount: 0xF4730BA8
-          sceAppMgrOverwriteLaunchParamForShell: 0xEC1FDACE
-          sceAppMgrPeekLaunchParamForShell: 0x6AD619D3
-          sceAppMgrPhotoMount: 0xF71CC393
-          sceAppMgrPhotoUmount: 0x3F1A3AEC
-          sceAppMgrPspSaveDataGetParams: 0xCF58EEE4
-          sceAppMgrPspSaveDataRead: 0x33C47470
-          sceAppMgrPspSaveDataRootMount: 0xC94B7E24
-          sceAppMgrReceiveEvent: 0xCFAD5A3A
-          sceAppMgrReceiveEventNum: 0x47E5DD7D
-          sceAppMgrReceiveNotificationRequestForShell: 0xF0DFB1EF
-          sceAppMgrReceiveShellEvent: 0x15AC8C52
-          sceAppMgrReceiveSystemEvent: 0x10B5765F
-          sceAppMgrSaveDataAddMount: 0x8B224917
-          sceAppMgrSaveDataDataRemove: 0x4544FCC5
-          sceAppMgrSaveDataDataRemove2: 0x36040E1D
-          sceAppMgrSaveDataDataSave: 0x84DE76C7
-          sceAppMgrSaveDataDataSave2: 0xD5CA4F56
-          sceAppMgrSaveDataGetQuota: 0x0717E2AE
-          sceAppMgrSaveDataMount: 0x31F3CC59
-          sceAppMgrSaveDataSlotCreate: 0x5181D7B3
-          sceAppMgrSaveDataSlotDelete: 0x6B0E7CF0
-          sceAppMgrSaveDataSlotFileClose: 0xFD7A4EEC
-          sceAppMgrSaveDataSlotFileGetParam: 0xC176317B
-          sceAppMgrSaveDataSlotFileOpen: 0x91BE107E
-          sceAppMgrSaveDataSlotGetParam: 0x17653D70
-          sceAppMgrSaveDataSlotGetStatus: 0x1F3A2F25
-          sceAppMgrSaveDataSlotInit: 0x4F8A92F1
-          sceAppMgrSaveDataSlotSetParam: 0xA8065FA4
-          sceAppMgrSaveDataSlotSetStatus: 0x3FD3073C
-          sceAppMgrSaveDataUmount: 0x8F513CF5
-          sceAppMgrSendNotificationRequest: 0x6E4997D7
-          sceAppMgrSendParam: 0xBB41230E
-          sceAppMgrSendSystemEvent: 0x2E4E1A1E
-          sceAppMgrSendSystemEvent2: 0xAEF9DF01
-          sceAppMgrSetBackRenderPortOwner: 0x7149016E
-          sceAppMgrSetBgmProxyApp: 0xC42F41E9
-          sceAppMgrSetNetworkDisconnectionWarningDialogState: 0xE352B29C
-          sceAppMgrSetPowerSaveMode: 0x2CF000BD
-          sceAppMgrSetRecommendedScreenOrientationForShell: 0x219043FF
-          sceAppMgrSetShellScreenOrientation: 0x5C7BE748
-          sceAppMgrSetSystemDataFile: 0x345F5CC0
-          sceAppMgrSetSystemDataFilePlayReady: 0x442ADA77
-          sceAppMgrSystemParamDateTimeGetConf: 0xE39FC7D5
-          sceAppMgrSystemParamGetInt: 0x5B75180C
-          sceAppMgrSystemParamGetString: 0x09899A08
-          sceAppMgrThemeDataMount: 0x633A7594
-          sceAppMgrTrophyMount: 0x84FE08EE
-          sceAppMgrTrophyMountById: 0x316207F3
-          sceAppMgrUmount: 0x5E375921
-          sceAppMgrUmountByPid: 0x919FDAE7
-          sceAppMgrUpdateSaveDataParam: 0x1B0BD20D
-          sceAppMgrWorkDirMount: 0x9B3BB24D
-          sceAppMgrWorkDirMountById: 0x80E86E42
       SceDrmBridgeUser:
         nid: 0x91AFEB43
         functions:
@@ -149,16 +18,3 @@ modules:
           sceErrorHistoryPostError: 0xBC416CFA
           sceErrorHistorySetDefaultFormat: 0x395240A1
           sceErrorHistoryUpdateSequenceInfo: 0x1AA2E39E
-      SceFios2User:
-        nid: 0xC2ED82D7
-        functions:
-          sceFiosOverlayAddForProcess02: 0x6C4BE9CD
-          sceFiosOverlayGetInfoForProcess02: 0xAB7B4213
-          sceFiosOverlayGetList02: 0x1DD808D1
-          sceFiosOverlayGetRecommendedScheduler02: 0xF5C1F928
-          sceFiosOverlayModifyForProcess02: 0xCA388053
-          sceFiosOverlayRemoveForProcess02: 0xE5D1B6F5
-          sceFiosOverlayResolveSync02: 0x9C3AAAF0
-          sceFiosOverlayResolveWithRangeSync02: 0x61C4AAC4
-          sceFiosOverlayThreadIsDisabled02: 0x23B8DB1D
-          sceFiosOverlayThreadSetDisabled02: 0x70321220
diff --git a/nids/360/SceFios2.yml b/nids/360/SceFios2.yml
index 579e695..539c461 100644
--- a/nids/360/SceFios2.yml
+++ b/nids/360/SceFios2.yml
@@ -173,3 +173,16 @@ modules:
           sceFiosTimeIntervalToNanoseconds: 0x397BF626
           sceFiosUpdateParameters: 0x1915052A
           sceFiosVprintf: 0x5BA4BD6D
+      SceFios2User:
+        nid: 0xC2ED82D7
+        functions:
+          sceFiosOverlayAddForProcess02: 0x6C4BE9CD
+          sceFiosOverlayGetInfoForProcess02: 0xAB7B4213
+          sceFiosOverlayGetList02: 0x1DD808D1
+          sceFiosOverlayGetRecommendedScheduler02: 0xF5C1F928
+          sceFiosOverlayModifyForProcess02: 0xCA388053
+          sceFiosOverlayRemoveForProcess02: 0xE5D1B6F5
+          sceFiosOverlayResolveSync02: 0x9C3AAAF0
+          sceFiosOverlayResolveWithRangeSync02: 0x61C4AAC4
+          sceFiosOverlayThreadIsDisabled02: 0x23B8DB1D
+          sceFiosOverlayThreadSetDisabled02: 0x70321220