Update to v4.15 kernel headers.
Test: Compiles, boots bullhead/hikey960.
Change-Id: I118beb8b6cac0881b1270f9bf6981959297a41a8
diff --git a/libc/kernel/uapi/linux/iso_fs.h b/libc/kernel/uapi/linux/iso_fs.h
index d88d646..8227031 100644
--- a/libc/kernel/uapi/linux/iso_fs.h
+++ b/libc/kernel/uapi/linux/iso_fs.h
@@ -22,34 +22,34 @@
#include <linux/magic.h>
#define ISODCL(from,to) (to - from + 1)
struct iso_volume_descriptor {
- char type[ISODCL(1, 1)];
+ __u8 type[ISODCL(1, 1)];
char id[ISODCL(2, 6)];
- char version[ISODCL(7, 7)];
- char data[ISODCL(8, 2048)];
+ __u8 version[ISODCL(7, 7)];
+ __u8 data[ISODCL(8, 2048)];
};
#define ISO_VD_PRIMARY 1
#define ISO_VD_SUPPLEMENTARY 2
#define ISO_VD_END 255
#define ISO_STANDARD_ID "CD001"
struct iso_primary_descriptor {
- char type[ISODCL(1, 1)];
+ __u8 type[ISODCL(1, 1)];
char id[ISODCL(2, 6)];
- char version[ISODCL(7, 7)];
- char unused1[ISODCL(8, 8)];
+ __u8 version[ISODCL(7, 7)];
+ __u8 unused1[ISODCL(8, 8)];
char system_id[ISODCL(9, 40)];
char volume_id[ISODCL(41, 72)];
- char unused2[ISODCL(73, 80)];
- char volume_space_size[ISODCL(81, 88)];
- char unused3[ISODCL(89, 120)];
- char volume_set_size[ISODCL(121, 124)];
- char volume_sequence_number[ISODCL(125, 128)];
- char logical_block_size[ISODCL(129, 132)];
- char path_table_size[ISODCL(133, 140)];
- char type_l_path_table[ISODCL(141, 144)];
- char opt_type_l_path_table[ISODCL(145, 148)];
- char type_m_path_table[ISODCL(149, 152)];
- char opt_type_m_path_table[ISODCL(153, 156)];
- char root_directory_record[ISODCL(157, 190)];
+ __u8 unused2[ISODCL(73, 80)];
+ __u8 volume_space_size[ISODCL(81, 88)];
+ __u8 unused3[ISODCL(89, 120)];
+ __u8 volume_set_size[ISODCL(121, 124)];
+ __u8 volume_sequence_number[ISODCL(125, 128)];
+ __u8 logical_block_size[ISODCL(129, 132)];
+ __u8 path_table_size[ISODCL(133, 140)];
+ __u8 type_l_path_table[ISODCL(141, 144)];
+ __u8 opt_type_l_path_table[ISODCL(145, 148)];
+ __u8 type_m_path_table[ISODCL(149, 152)];
+ __u8 opt_type_m_path_table[ISODCL(153, 156)];
+ __u8 root_directory_record[ISODCL(157, 190)];
char volume_set_id[ISODCL(191, 318)];
char publisher_id[ISODCL(319, 446)];
char preparer_id[ISODCL(447, 574)];
@@ -57,34 +57,34 @@
char copyright_file_id[ISODCL(703, 739)];
char abstract_file_id[ISODCL(740, 776)];
char bibliographic_file_id[ISODCL(777, 813)];
- char creation_date[ISODCL(814, 830)];
- char modification_date[ISODCL(831, 847)];
- char expiration_date[ISODCL(848, 864)];
- char effective_date[ISODCL(865, 881)];
- char file_structure_version[ISODCL(882, 882)];
- char unused4[ISODCL(883, 883)];
- char application_data[ISODCL(884, 1395)];
- char unused5[ISODCL(1396, 2048)];
+ __u8 creation_date[ISODCL(814, 830)];
+ __u8 modification_date[ISODCL(831, 847)];
+ __u8 expiration_date[ISODCL(848, 864)];
+ __u8 effective_date[ISODCL(865, 881)];
+ __u8 file_structure_version[ISODCL(882, 882)];
+ __u8 unused4[ISODCL(883, 883)];
+ __u8 application_data[ISODCL(884, 1395)];
+ __u8 unused5[ISODCL(1396, 2048)];
};
struct iso_supplementary_descriptor {
- char type[ISODCL(1, 1)];
+ __u8 type[ISODCL(1, 1)];
char id[ISODCL(2, 6)];
- char version[ISODCL(7, 7)];
- char flags[ISODCL(8, 8)];
+ __u8 version[ISODCL(7, 7)];
+ __u8 flags[ISODCL(8, 8)];
char system_id[ISODCL(9, 40)];
char volume_id[ISODCL(41, 72)];
- char unused2[ISODCL(73, 80)];
- char volume_space_size[ISODCL(81, 88)];
- char escape[ISODCL(89, 120)];
- char volume_set_size[ISODCL(121, 124)];
- char volume_sequence_number[ISODCL(125, 128)];
- char logical_block_size[ISODCL(129, 132)];
- char path_table_size[ISODCL(133, 140)];
- char type_l_path_table[ISODCL(141, 144)];
- char opt_type_l_path_table[ISODCL(145, 148)];
- char type_m_path_table[ISODCL(149, 152)];
- char opt_type_m_path_table[ISODCL(153, 156)];
- char root_directory_record[ISODCL(157, 190)];
+ __u8 unused2[ISODCL(73, 80)];
+ __u8 volume_space_size[ISODCL(81, 88)];
+ __u8 escape[ISODCL(89, 120)];
+ __u8 volume_set_size[ISODCL(121, 124)];
+ __u8 volume_sequence_number[ISODCL(125, 128)];
+ __u8 logical_block_size[ISODCL(129, 132)];
+ __u8 path_table_size[ISODCL(133, 140)];
+ __u8 type_l_path_table[ISODCL(141, 144)];
+ __u8 opt_type_l_path_table[ISODCL(145, 148)];
+ __u8 type_m_path_table[ISODCL(149, 152)];
+ __u8 opt_type_m_path_table[ISODCL(153, 156)];
+ __u8 root_directory_record[ISODCL(157, 190)];
char volume_set_id[ISODCL(191, 318)];
char publisher_id[ISODCL(319, 446)];
char preparer_id[ISODCL(447, 574)];
@@ -92,59 +92,59 @@
char copyright_file_id[ISODCL(703, 739)];
char abstract_file_id[ISODCL(740, 776)];
char bibliographic_file_id[ISODCL(777, 813)];
- char creation_date[ISODCL(814, 830)];
- char modification_date[ISODCL(831, 847)];
- char expiration_date[ISODCL(848, 864)];
- char effective_date[ISODCL(865, 881)];
- char file_structure_version[ISODCL(882, 882)];
- char unused4[ISODCL(883, 883)];
- char application_data[ISODCL(884, 1395)];
- char unused5[ISODCL(1396, 2048)];
+ __u8 creation_date[ISODCL(814, 830)];
+ __u8 modification_date[ISODCL(831, 847)];
+ __u8 expiration_date[ISODCL(848, 864)];
+ __u8 effective_date[ISODCL(865, 881)];
+ __u8 file_structure_version[ISODCL(882, 882)];
+ __u8 unused4[ISODCL(883, 883)];
+ __u8 application_data[ISODCL(884, 1395)];
+ __u8 unused5[ISODCL(1396, 2048)];
};
#define HS_STANDARD_ID "CDROM"
struct hs_volume_descriptor {
- char foo[ISODCL(1, 8)];
- char type[ISODCL(9, 9)];
+ __u8 foo[ISODCL(1, 8)];
+ __u8 type[ISODCL(9, 9)];
char id[ISODCL(10, 14)];
- char version[ISODCL(15, 15)];
- char data[ISODCL(16, 2048)];
+ __u8 version[ISODCL(15, 15)];
+ __u8 data[ISODCL(16, 2048)];
};
struct hs_primary_descriptor {
- char foo[ISODCL(1, 8)];
- char type[ISODCL(9, 9)];
- char id[ISODCL(10, 14)];
- char version[ISODCL(15, 15)];
- char unused1[ISODCL(16, 16)];
+ __u8 foo[ISODCL(1, 8)];
+ __u8 type[ISODCL(9, 9)];
+ __u8 id[ISODCL(10, 14)];
+ __u8 version[ISODCL(15, 15)];
+ __u8 unused1[ISODCL(16, 16)];
char system_id[ISODCL(17, 48)];
char volume_id[ISODCL(49, 80)];
- char unused2[ISODCL(81, 88)];
- char volume_space_size[ISODCL(89, 96)];
- char unused3[ISODCL(97, 128)];
- char volume_set_size[ISODCL(129, 132)];
- char volume_sequence_number[ISODCL(133, 136)];
- char logical_block_size[ISODCL(137, 140)];
- char path_table_size[ISODCL(141, 148)];
- char type_l_path_table[ISODCL(149, 152)];
- char unused4[ISODCL(153, 180)];
- char root_directory_record[ISODCL(181, 214)];
+ __u8 unused2[ISODCL(81, 88)];
+ __u8 volume_space_size[ISODCL(89, 96)];
+ __u8 unused3[ISODCL(97, 128)];
+ __u8 volume_set_size[ISODCL(129, 132)];
+ __u8 volume_sequence_number[ISODCL(133, 136)];
+ __u8 logical_block_size[ISODCL(137, 140)];
+ __u8 path_table_size[ISODCL(141, 148)];
+ __u8 type_l_path_table[ISODCL(149, 152)];
+ __u8 unused4[ISODCL(153, 180)];
+ __u8 root_directory_record[ISODCL(181, 214)];
};
struct iso_path_table {
- unsigned char name_len[2];
- char extent[4];
- char parent[2];
+ __u8 name_len[2];
+ __u8 extent[4];
+ __u8 parent[2];
char name[0];
} __attribute__((packed));
struct iso_directory_record {
- char length[ISODCL(1, 1)];
- char ext_attr_length[ISODCL(2, 2)];
- char extent[ISODCL(3, 10)];
- char size[ISODCL(11, 18)];
- char date[ISODCL(19, 25)];
- char flags[ISODCL(26, 26)];
- char file_unit_size[ISODCL(27, 27)];
- char interleave[ISODCL(28, 28)];
- char volume_sequence_number[ISODCL(29, 32)];
- unsigned char name_len[ISODCL(33, 33)];
+ __u8 length[ISODCL(1, 1)];
+ __u8 ext_attr_length[ISODCL(2, 2)];
+ __u8 extent[ISODCL(3, 10)];
+ __u8 size[ISODCL(11, 18)];
+ __u8 date[ISODCL(19, 25)];
+ __u8 flags[ISODCL(26, 26)];
+ __u8 file_unit_size[ISODCL(27, 27)];
+ __u8 interleave[ISODCL(28, 28)];
+ __u8 volume_sequence_number[ISODCL(29, 32)];
+ __u8 name_len[ISODCL(33, 33)];
char name[0];
} __attribute__((packed));
#define ISOFS_BLOCK_BITS 11