Revert "core/hle: Reorganize ErrorModule enum numerically"

This reverts commit b55be320b75d01bdc1320bc78179542b2ce10fb2.

1 files changed, 138 insertions, 205 deletions

diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index 63b124f50..b0a32d74b 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -17,239 +17,172 @@
  * contained.
  */
 enum class ErrorModule : u32 {
-    // 0-9
     Common = 0,
-    Svc = 1,
-    Fs = 2,
-    Os = 3,
-    Htcs = 4,
-    Ncm = 5,
-    Dd = 6,
-    Osdbg = 7,
-    Lr = 8,
-    Ldr = 9,
-
-    // 10-19
-    Sf = 10,
-    SfHipc = 11,
-    Tma = 12,
-    Dmnt = 13,
-    Gds = 14,
-    Pm = 15,
-    Ns = 16,
-    BsdSockets = 17,
-    Htc = 18,
-    Tsc = 19,
-
-    // 20-29
-    Kvdb = 20,
-    Sm = 21,
-    Ro = 22,
-    Gc = 23,
-    Sdmmc = 24,
-    Ovln = 25,
-    Spl = 26,
+    Kernel = 1,
+    FS = 2,
+    OS = 3, // used for Memory, Thread, Mutex, Nvidia
+    HTCS = 4,
+    NCM = 5,
+    DD = 6,
+    LR = 8,
+    Loader = 9,
+    CMIF = 10,
+    HIPC = 11,
+    TMA = 12,
+    DMNT = 13,
+    GDS = 14,
+    PM = 15,
+    NS = 16,
+    BSDSockets = 17,
+    HTC = 18,
+    TSC = 19,
+    NCMContent = 20,
+    SM = 21,
+    RO = 22,
+    GC = 23,
+    SDMMC = 24,
+    OVLN = 25,
+    SPL = 26,
     Socket = 27,
-    Htclow = 29,
-
-    // 30-39
-    Ddsf = 30,
-    Htcfs = 31,
+    HTCLOW = 29,
+    DDSF = 30,
+    HTCFS = 31,
     Async = 32,
     Util = 33,
-    Tipc = 35,
-    Anif = 37,
-    Crt = 39,
-
-    // 100-109
-    Eth = 100,
-    I2c = 101,
-    Gpio = 102,
-    Uart = 103,
-    Cpad = 104,
+    TIPC = 35,
+    ANIF = 37,
+    ETHC = 100,
+    I2C = 101,
+    GPIO = 102,
+    UART = 103,
+    CPAD = 104,
     Settings = 105,
-    Ftm = 106,
-    Wlan = 107,
-    Xcd = 108,
-    Tmp451 = 109,
-
-    // 110-119
-    Nifm = 110,
-    Codec = 111,
-    Lsm6ds3 = 112,
+    FTM = 106,
+    WLAN = 107,
+    XCD = 108,
+    TMP451 = 109,
+    NIFM = 110,
+    HwOpus = 111,
+    LSM6DS3 = 112,
     Bluetooth = 113,
-    Vi = 114,
-    Nfp = 115,
+    VI = 114,
+    NFP = 115,
     Time = 116,
-    Fgm = 117,
-    Oe = 118,
-    Bh1730fvc = 119,
-
-    // 120-129
-    Pcie = 120,
+    FGM = 117,
+    OE = 118,
+    BH1730FVC = 119,
+    PCIe = 120,
     Friends = 121,
-    Bcat = 122,
-    Ssl = 123,
+    BCAT = 122,
+    SSLSrv = 123,
     Account = 124,
     News = 125,
     Mii = 126,
-    Nfc = 127,
-    Am = 128,
-    Prepo = 129,
-
-    // 130-139
-    Ahid = 130,
-    Applet = 131,
-    Ae = 132,
-    Pcv = 133,
-    UsbPd = 134,
-    Bpc = 135,
-    Psm = 136,
-    Nim = 137,
-    Psc = 138,
-    Tc = 139,
-
-    // 140-149
-    Usb = 140,
-    Nsd = 141,
-    Pctl = 142,
-    Btm = 143,
-    La = 144,
-    Es = 145,
-    Ngc = 146,
-    Erpt = 147,
-    Apm = 148,
-    Cec = 149,
-
-    // 150-159
+    NFC = 127,
+    AM = 128,
+    PlayReport = 129,
+    AHID = 130,
+    Qlaunch = 132,
+    PCV = 133,
+    USBPD = 134,
+    BPC = 135,
+    PSM = 136,
+    NIM = 137,
+    PSC = 138,
+    TC = 139,
+    USB = 140,
+    NSD = 141,
+    PCTL = 142,
+    BTM = 143,
+    LA = 144,
+    ETicket = 145,
+    NGC = 146,
+    ERPT = 147,
+    APM = 148,
+    CEC = 149,
     Profiler = 150,
-    Eupld = 151,
-    Lidbe = 152,
+    ErrorUpload = 151,
+    LIDBE = 152,
     Audio = 153,
-    Npns = 154,
-    Http = 155,
-    Idle = 156,
-    Arp = 157,
-    Updater = 158,
-    Swkbd = 159,
-
-    // 160-169
-    Netdiag = 160,
-    NfcMifare = 161,
-    Err = 162,
+    NPNS = 154,
+    NPNSHTTPSTREAM = 155,
+    ARP = 157,
+    SWKBD = 158,
+    BOOT = 159,
+    NetDiag = 160,
+    NFCMifare = 161,
+    UserlandAssert = 162,
     Fatal = 163,
-    Ec = 164,
-    Spsm = 165,
-    Aoc = 166,
-    Bgtc = 167,
-    Creport = 168,
-    Sasbus = 169,
-
-    // 170-179
-    Pl = 170,
-    Audioctrl = 172,
-    Lbl = 173,
-    Jit = 175,
-    Hdcp = 176,
-    Omm = 177,
-    Pdm = 178,
-    Olsc = 179,
-
-    // 180-189
-    Srepo = 180,
+    NIMShop = 164,
+    SPSM = 165,
+    BGTC = 167,
+    UserlandCrash = 168,
+    SASBUS = 169,
+    PI = 170,
+    AudioCtrl = 172,
+    LBL = 173,
+    JIT = 175,
+    HDCP = 176,
+    OMM = 177,
+    PDM = 178,
+    OLSC = 179,
+    SREPO = 180,
     Dauth = 181,
-    Stdfu = 182,
-    Dbg = 183,
-    Dhcps = 186,
-    Spi = 187,
-    Avm = 188,
-    Pwm = 189,
-
-    // 190-199
-    Rtc = 191,
+    STDFU = 182,
+    DBG = 183,
+    DHCPS = 186,
+    SPI = 187,
+    AVM = 188,
+    PWM = 189,
+    RTC = 191,
     Regulator = 192,
-    Led = 193,
-    Sio = 195,
-    Pcm = 196,
-    Clkrst = 197,
-    Powctl = 198,
-
-    // 200-209
+    LED = 193,
+    SIO = 195,
+    PCM = 196,
+    CLKRST = 197,
+    POWCTL = 198,
     AudioOld = 201,
-    Hid = 202,
-    Ldn = 203,
-    Cs = 204,
+    HID = 202,
+    LDN = 203,
+    CS = 204,
     Irsensor = 205,
-    Capsrv = 206,
+    Capture = 206,
     Manu = 208,
-    Atk = 209,
-
-    // 210-219
-    Web = 210,
-    Lcs = 211,
-    Grc = 212,
+    ATK = 209,
+    WEB = 210,
+    LCS = 211,
+    GRC = 212,
     Repair = 213,
     Album = 214,
-    Rid = 215,
+    RID = 215,
     Migration = 216,
-    MigrationIdc = 217,
-    Hidbus = 218,
-    Ens = 219,
-
-    // 220-229
-    Websocket = 223,
-    Dcdmtp = 227,
-    Pgl = 228,
+    MigrationLdcServ = 217,
+    HIDBUS = 218,
+    ENS = 219,
+    WebSocket = 223,
+    DCDMTP = 227,
+    PGL = 228,
     Notification = 229,
-
-    // 230-239
-    Ins = 230,
-    Lp2p = 231,
-    Rcd = 232,
-    Icm40607 = 233,
-    Prc = 235,
-    TmaHtc = 237,
-    Ectx = 238,
-    Mnpp = 239,
-
-    // 240-249
-    Hshl = 240,
-    Capmtp = 242,
-    Dp2hdmi = 244,
+    INS = 230,
+    LP2P = 231,
+    RCD = 232,
+    LCM40607 = 233,
+    PRC = 235,
+    TMAHTC = 237,
+    ECTX = 238,
+    MNPP = 239,
+    HSHL = 240,
+    CAPMTP = 242,
+    DP2HDMI = 244,
     Cradle = 245,
-    Sprofile = 246,
-
-    // 250-299
-    Ndrm = 250,
-    Fst2 = 251,
-    Nex = 306,
-
-    // 300-399
-    Npln = 321,
-    LibNx = 345,
-    HomebrewAbi = 346,
-    HomebrewLoader = 347,
-    LibNxNvidia = 348,
-    LibNxBinder = 349,
-
-    // 400-499
-    Tspm = 499,
-
-    // 500-599
-    Devmenu = 500,
-    Nverpt = 520,
-    AmStuckMonitor = 521,
-
-    // 600-699
-    Pia = 618,
-    Eagle = 623,
-
-    // 800-899
+    SProfile = 246,
+    NDRM = 250,
+    TSPM = 499,
+    DevMenu = 500,
     GeneralWebApplet = 800,
     WifiWebAuthApplet = 809,
     WhitelistedApplet = 810,
     ShopN = 811,
-    Coral = 815,
 };
 
 /// Encapsulates a Horizon OS error code, allowing it to be separated into its constituent fields.