Le 13/01/2020 à 21:34, Aleksandar Markovic a écrit : > From: Aleksandar Markovic <amarko...@wavecomp.com> > > FDFMTBEG, FDFMTTRK, and FDFMTEND ioctls provide means for controlling > formatting of a floppy drive. > > FDFMTTRK's third agrument is a pointer to the structure: > > struct format_descr { > unsigned int device,head,track; > }; > > defined in Linux kernel header <linux/fd.h>. > > Since all fields of the structure are of type 'unsigned int', there is > no need to define "target_format_descr". > > FDFMTBEG and FDFMTEND ioctls do not use the third argument. > > Signed-off-by: Aleksandar Markovic <amarko...@wavecomp.com> > --- > linux-user/ioctls.h | 3 +++ > linux-user/syscall_defs.h | 3 +++ > linux-user/syscall_types.h | 5 +++++ > 3 files changed, 11 insertions(+) > > diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h > index 9e3ca90..e754a6b 100644 > --- a/linux-user/ioctls.h > +++ b/linux-user/ioctls.h > @@ -115,6 +115,9 @@ > IOCTL(FDMSGON, 0, TYPE_NULL) > IOCTL(FDMSGOFF, 0, TYPE_NULL) > IOCTL(FDSETEMSGTRESH, 0, TYPE_NULL) > + IOCTL(FDFMTBEG, 0, TYPE_NULL) > + IOCTL(FDFMTTRK, IOC_W, MK_PTR(MK_STRUCT(STRUCT_format_descr))) > + IOCTL(FDFMTEND, 0, TYPE_NULL) > IOCTL(FDFLUSH, 0, TYPE_NULL) > IOCTL(FDSETMAXERRS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_floppy_max_errors))) > IOCTL(FDGETMAXERRS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_floppy_max_errors))) > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index efe3860..d85ab46 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -899,6 +899,9 @@ struct target_pollfd { > > #define TARGET_FDMSGON TARGET_IO(2, 0x45) > #define TARGET_FDMSGOFF TARGET_IO(2, 0x46) > +#define TARGET_FDFMTBEG TARGET_IO(2, 0x47) > +#define TARGET_FDFMTTRK TARGET_IOW(2, 0x48, struct format_descr) > +#define TARGET_FDFMTEND TARGET_IO(2, 0x49) > #define TARGET_FDSETEMSGTRESH TARGET_IO(2, 0x4a) > #define TARGET_FDFLUSH TARGET_IO(2, 0x4b) > #define TARGET_FDSETMAXERRS TARGET_IOW(2, 0x4c, struct floppy_max_errors) > diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h > index e4e0429..8ff78a6 100644 > --- a/linux-user/syscall_types.h > +++ b/linux-user/syscall_types.h > @@ -261,6 +261,11 @@ STRUCT(blkpg_ioctl_arg, > TYPE_INT, /* datalen */ > TYPE_PTRVOID) /* data */ > > +STRUCT(format_descr, > + TYPE_INT, /* device */ > + TYPE_INT, /* head */ > + TYPE_INT) /* track */ > + > STRUCT(floppy_max_errors, > TYPE_INT, /* abort */ > TYPE_INT, /* read_track */ >
Reviewed-by: Laurent Vivier <laur...@vivier.eu>