ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

[firefly-linux-kernel-4.4.55.git] / include / uapi / linux / msdos_fs.h

diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h
index db4ae0cd16c7f2d7ffa9b009be9a1f08a991632c..e956704f5fb1b24ceba1b0157c8d37cf87ee3d15 100644 (file)
--- a/include/uapi/linux/msdos_fs.h
+++ b/include/uapi/linux/msdos_fs.h
@@ -104,7 +104,8 @@ struct __fat_dirent {
 /* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
 #define FAT_IOCTL_GET_ATTRIBUTES       _IOR('r', 0x10, __u32)
 #define FAT_IOCTL_SET_ATTRIBUTES       _IOW('r', 0x11, __u32)
-#define VFAT_IOCTL_GET_VOLUME_ID       _IOR('r', 0x12, __u32)
+/*Android kernel has used 0x12, so we use 0x13*/
+#define FAT_IOCTL_GET_VOLUME_ID                _IOR('r', 0x13, __u32)
 
 struct fat_boot_sector {
        __u8    ignored[3];     /* Boot strap short or near jump */
@@ -129,7 +130,11 @@ struct fat_boot_sector {
                        __u8    drive_number;   /* Physical drive number */
                        __u8    state;          /* undocumented, but used
                                                   for mount state. */
-                       /* other fiealds are not added here */
+                       __u8    signature;  /* extended boot signature */
+                       __u8    vol_id[4];      /* volume ID */
+                       __u8    vol_label[11];  /* volume label */
+                       __u8    fs_type[8];             /* file system type */
+                       /* other fields are not added here */
                } fat16;
 
                struct {
@@ -148,7 +153,11 @@ struct fat_boot_sector {
                        __u8    drive_number;   /* Physical drive number */
                        __u8    state;          /* undocumented, but used
                                                   for mount state. */
-                       /* other fiealds are not added here */
+                       __u8    signature;  /* extended boot signature */
+                       __u8    vol_id[4];      /* volume ID */
+                       __u8    vol_label[11];  /* volume label */
+                       __u8    fs_type[8];             /* file system type */
+                       /* other fields are not added here */
                } fat32;
        };
 };
@@ -162,17 +171,6 @@ struct fat_boot_fsinfo {
        __le32   reserved2[4];
 };
 
-struct fat_boot_bsx {
-       __u8     drive;         /* drive number */
-       __u8     reserved1;
-       __u8     signature;     /* extended boot signature */
-       __u8     vol_id[4];     /* volume ID */
-       __u8     vol_label[11]; /* volume label */
-       __u8     type[8];       /* file system type */
-};
-#define FAT16_BSX_OFFSET 36 /* offset of fat_boot_bsx in FAT12 and FAT16 */
-#define FAT32_BSX_OFFSET 64 /* offset of fat_boot_bsx in FAT32 */
-
 struct msdos_dir_entry {
        __u8    name[MSDOS_NAME];/* name and extension */
        __u8    attr;           /* attribute bits */