Merge tag 'efi-2019-10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / disk / part_iso.h

diff --git a/disk/part_iso.h b/disk/part_iso.h
index e5a3e0220f062befd458ea89fd271089d47715d4..eb2c3ab66f4ed6848a1e1360231daaf5dea91794 100644 (file)
--- a/disk/part_iso.h
+++ b/disk/part_iso.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier:    GPL-2.0+ 
  */
 #ifndef _PART_CD_H
 #define _PART_CD_H
@@ -29,8 +28,8 @@ typedef struct iso_pri_rec {
        char                                    sysid[32];              /* system Identifier */
        char                                    volid[32];              /* volume Identifier */
        unsigned char zeros1[8];                /* unused */
-       unsigned long volsiz_LE;                /* volume size Little Endian */
-       unsigned long volsiz_BE;                /* volume size Big Endian */
+       unsigned int volsiz_LE;         /* volume size Little Endian */
+       unsigned int volsiz_BE;         /* volume size Big Endian */
        unsigned char zeros2[32];               /* unused */
        unsigned short setsize_LE;      /* volume set size LE */
        unsigned short setsize_BE;      /* volume set size BE */
@@ -38,12 +37,12 @@ typedef struct iso_pri_rec {
        unsigned short seqnum_BE;               /* volume sequence number BE */
        unsigned short secsize_LE;      /* sector size LE */
        unsigned short secsize_BE;      /* sector size BE */
-       unsigned long pathtablen_LE;/* Path Table size LE */
-       unsigned long pathtablen_BE;/* Path Table size BE */
-       unsigned long firstsek_LEpathtab1_LE; /* location of first occurrence of little endian type path table */
-       unsigned long firstsek_LEpathtab2_LE; /* location of optional occurrence of little endian type path table */
-       unsigned long firstsek_BEpathtab1_BE; /* location of first occurrence of big endian type path table */
-       unsigned long firstsek_BEpathtab2_BE; /* location of optional occurrence of big endian type path table */
+       unsigned int pathtablen_LE;/* Path Table size LE */
+       unsigned int pathtablen_BE;/* Path Table size BE */
+       unsigned int firstsek_LEpathtab1_LE; /* location of first occurrence of little endian type path table */
+       unsigned int firstsek_LEpathtab2_LE; /* location of optional occurrence of little endian type path table */
+       unsigned int firstsek_BEpathtab1_BE; /* location of first occurrence of big endian type path table */
+       unsigned int firstsek_BEpathtab2_BE; /* location of optional occurrence of big endian type path table */
        unsigned char rootdir[34];      /* directory record for root dir */
        char                                    volsetid[128];/* Volume set identifier */
        char                                    pubid[128];             /* Publisher identifier */
@@ -67,8 +66,8 @@ typedef struct iso_sup_rec {
        char                                    sysid[32];              /* system Identifier */
        char                                    volid[32];              /* volume Identifier */
        unsigned char zeros1[8];                /* unused */
-       unsigned long volsiz_LE;                /* volume size Little Endian */
-       unsigned long volsiz_BE;                /* volume size Big Endian */
+       unsigned int volsiz_LE;         /* volume size Little Endian */
+       unsigned int volsiz_BE;         /* volume size Big Endian */
        unsigned char escapeseq[32];/* Escape sequences */
        unsigned short setsize_LE;      /* volume set size LE */
        unsigned short setsize_BE;      /* volume set size BE */
@@ -76,12 +75,12 @@ typedef struct iso_sup_rec {
        unsigned short seqnum_BE;               /* volume sequence number BE */
        unsigned short secsize_LE;      /* sector size LE */
        unsigned short secsize_BE;      /* sector size BE */
-       unsigned long pathtablen_LE;/* Path Table size LE */
-       unsigned long pathtablen_BE;/* Path Table size BE */
-       unsigned long firstsek_LEpathtab1_LE; /* location of first occurrence of little endian type path table */
-       unsigned long firstsek_LEpathtab2_LE; /* location of optional occurrence of little endian type path table */
-       unsigned long firstsek_BEpathtab1_BE; /* location of first occurrence of big endian type path table */
-       unsigned long firstsek_BEpathtab2_BE; /* location of optional occurrence of big endian type path table */
+       unsigned int pathtablen_LE;/* Path Table size LE */
+       unsigned int pathtablen_BE;/* Path Table size BE */
+       unsigned int firstsek_LEpathtab1_LE; /* location of first occurrence of little endian type path table */
+       unsigned int firstsek_LEpathtab2_LE; /* location of optional occurrence of little endian type path table */
+       unsigned int firstsek_BEpathtab1_BE; /* location of first occurrence of big endian type path table */
+       unsigned int firstsek_BEpathtab2_BE; /* location of optional occurrence of big endian type path table */
        unsigned char rootdir[34];      /* directory record for root dir */
        char                                    volsetid[128];/* Volume set identifier */
        char                                    pubid[128];             /* Publisher identifier */
@@ -104,10 +103,10 @@ typedef struct iso_part_rec {
        unsigned char unused;
        char                                    sysid[32];               /* system Identifier */
        char                                    volid[32];              /* volume partition Identifier */
-       unsigned long partloc_LE;               /* volume partition location LE */
-       unsigned long partloc_BE;               /* volume partition location BE */
-       unsigned long partsiz_LE;               /* volume partition size LE */
-       unsigned long partsiz_BE;               /* volume partition size BE */
+       unsigned int partloc_LE;                /* volume partition location LE */
+       unsigned int partloc_BE;                /* volume partition location BE */
+       unsigned int partsiz_LE;                /* volume partition size LE */
+       unsigned int partsiz_BE;                /* volume partition size BE */
 }iso_part_rec_t;