add predefined macros for kelf related constants

Author: israpps

src/kelf.cpp

@@ -136,19 +136,19 @@ int Kelf::LoadKelf(const std::string &filename)
             break;
     }
     switch (header.ApplicationType) {
-        case 0:
+        case KELFTYPE_DISC_WOOBLE:
             printf("header.ApplicationType = 0 (disc wobble \?)\n");
             break;
-        case 1:
+        case KELFTYPE_XOSDMAIN:
             printf("header.ApplicationType = 1 (xosdmain)\n");
             break;
-        case 5:
+        case KELFTYPE_DVDPLAYER_KIRX:
             printf("header.ApplicationType = 5 (dvdplayer kirx)\n");
             break;
-        case 7:
+        case KELFTYPE_DVDPLAYER_KELF:
             printf("header.ApplicationType = 7 (dvdplayer kelf)\n");
             break;
-        case 11:
+        case KELFTYPE_EARLY_MBR:
             printf("header.ApplicationType = 11 (early mbr \?)\n");
             break;
         default:
@@ -159,9 +159,9 @@ int Kelf::LoadKelf(const std::string &filename)
             break;
     }
     printf("header.Flags           = %#X", header.Flags);
-    if (header.Flags == 0x022c)
+    if (header.Flags == HDR_PREDEF_KELF)
         printf(" - kelf:");
-    else if (header.Flags == 0x021c)
+    else if (header.Flags == HDR_PREDEF_KIRX)
         printf(" - kirx:");
     else
         printf(" - unknown:");
@@ -203,7 +203,7 @@ int Kelf::LoadKelf(const std::string &filename)
     printf("header.MGZones         = %#X |", header.MGZones);
     if (header.MGZones == 0)
         printf("All regions blocked (useless)|");
-    else if (header.MGZones == 0xFF)
+    else if (header.MGZones == REGION_ALL_ALLOWED )
         printf("All regions allowed|");
     else {
         if (header.MGZones & REGION_JP)
@@ -389,7 +389,7 @@ int Kelf::SaveKelf(const std::string &filename, int headerid)
     header.SystemType      = SYSTEM_TYPE_PS2;     // same for COH (arcade)
     header.ApplicationType = 1;                   // 1 = xosdmain, 5 = dvdplayer kirx 7 = dvdplayer kelf 0xB - ?? 0x00 - ??
     // TODO: implement and check 3DES/1DES difference based on header.Flags. In both - encryption and decryption.
-    header.Flags    = 0x022C; // ?? 00000010 00101100 binary, 0x021C for kirx
+    header.Flags    = HDR_PREDEF_KELF; // ?? 00000010 00101100 binary, 0x021C for kirx
     header.MGZones  = 0xFF;   // region bit, 1 - allowed
     header.BitCount = 0;
     // ?? balika, wisi: strange value, represents number of blacklisted iLinkID, ConsoleID

src/kelf.h

@@ -76,6 +76,8 @@ struct KELFHeader
 #define HDR_FLAG13          0x2000 // Unset. ??
 #define HDR_FLAG14          0x4000 // Unset. ??
 #define HDR_FLAG15          0x8000 // Unset. ??
+#define HDR_PREDEF_KELF 0x022c
+#define HDR_PREDEF_KIRX 0x021c
 
 // MGZones region flags. If unset - blocked in that region
 #define REGION_JP   0x1  // Japan
@@ -86,6 +88,13 @@ struct KELFHeader
 #define REGION_RU   0x20 // Russia
 #define REGION_CH   0x40 // China
 #define REGION_MX   0x80 // Mexico
+#define REGION_ALL_ALLOWED 0xFF
+
+#define KELFTYPE_DISC_WOOBLE 0
+#define KELFTYPE_XOSDMAIN 1
+#define KELFTYPE_DVDPLAYER_KIRX 5
+#define KELFTYPE_DVDPLAYER_KELF 7
+#define KELFTYPE_EARLY_MBR 11
 
 struct BitTable
 {