Le 16/01/2020 à 23:49, Aleksandar Markovic a écrit : > From: Aleksandar Markovic <amarko...@wavecomp.com> > > FDSETEMSGTRESH, FDSETMAXERRS, and FDGETMAXERRS ioctls are commands > for controlling error reporting of a floppy drive. > > FDSETEMSGTRESH's third agrument is a pointer to the structure: > > struct floppy_max_errors { > unsigned int > abort, /* number of errors to be reached before aborting */ > read_track, /* maximal number of errors permitted to read an > * entire track at once */ > reset, /* maximal number of errors before a reset is tried */ > recal, /* maximal number of errors before a recalibrate is > * tried */ > /* > * Threshold for reporting FDC errors to the console. > * Setting this to zero may flood your screen when using > * ultra cheap floppies ;-) > */ > reporting; > }; > > 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_floppy_max_errors". > > FDSETMAXERRS and FDGETMAXERRS ioctls do not use the third argument. > > Reviewed-by: Laurent Vivier <laur...@vivier.eu> > Signed-off-by: Aleksandar Markovic <amarko...@wavecomp.com> > --- > linux-user/ioctls.h | 3 +++ > linux-user/syscall_defs.h | 3 +++ > linux-user/syscall_types.h | 7 +++++++ > 3 files changed, 13 insertions(+) > > diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h > index 66f8c4e..9e3ca90 100644 > --- a/linux-user/ioctls.h > +++ b/linux-user/ioctls.h > @@ -114,7 +114,10 @@ > > IOCTL(FDMSGON, 0, TYPE_NULL) > IOCTL(FDMSGOFF, 0, TYPE_NULL) > + IOCTL(FDSETEMSGTRESH, 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))) > IOCTL(FDRESET, 0, TYPE_NULL) > IOCTL(FDRAWCMD, 0, TYPE_NULL) > IOCTL(FDTWADDLE, 0, TYPE_NULL) > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index d4d39de..e317115 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -899,7 +899,10 @@ struct target_pollfd { > > #define TARGET_FDMSGON TARGET_IO(2, 0x45) > #define TARGET_FDMSGOFF TARGET_IO(2, 0x46) > +#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) > +#define TARGET_FDGETMAXERRS TARGET_IOR(2, 0x0e, struct floppy_max_errors) > #define TARGET_FDRESET TARGET_IO(2, 0x54) > #define TARGET_FDRAWCMD TARGET_IO(2, 0x58) > #define TARGET_FDTWADDLE TARGET_IO(2, 0x59) > diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h > index ca9429e..434ce1c 100644 > --- a/linux-user/syscall_types.h > +++ b/linux-user/syscall_types.h > @@ -266,6 +266,13 @@ STRUCT(blkpg_ioctl_arg, > TYPE_INT, /* datalen */ > TYPE_PTRVOID) /* data */ > > +STRUCT(floppy_max_errors, > + TYPE_INT, /* abort */ > + TYPE_INT, /* read_track */ > + TYPE_INT, /* reset */ > + TYPE_INT, /* recal */ > + TYPE_INT) /* reporting */ > + > #if defined(CONFIG_USBFS) > /* usb device ioctls */ > STRUCT(usbdevfs_ctrltransfer, >
Applied to my linux-user branch. Thanks, Laurent