From patchwork Fri Jan 24 15:47:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Markovic X-Patchwork-Id: 11350607 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EFF57921 for ; Fri, 24 Jan 2020 15:49:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD2012071E for ; Fri, 24 Jan 2020 15:49:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD2012071E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=rt-rk.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iv1Cy-0006oZ-Sv for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jan 2020 10:49:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57663) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iv1CM-0005Z2-2t for qemu-devel@nongnu.org; Fri, 24 Jan 2020 10:48:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iv1CK-0006Mw-QQ for qemu-devel@nongnu.org; Fri, 24 Jan 2020 10:48:42 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:43619 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iv1CK-0005xM-Eh for qemu-devel@nongnu.org; Fri, 24 Jan 2020 10:48:40 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 5FD9A1A20B8; Fri, 24 Jan 2020 16:47:35 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 17EA51A205E; Fri, 24 Jan 2020 16:47:35 +0100 (CET) From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] linux-user: Add support for FDGETFDCSTAT ioctl Date: Fri, 24 Jan 2020 16:47:19 +0100 Message-Id: <1579880839-31466-5-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1579880839-31466-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1579880839-31466-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Aleksandar Markovic FDGETFDCSTAT's third agrument is a pointer to the structure: struct floppy_fdc_state { int spec1; int spec2; int dtr; unsigned char version; unsigned char dor; unsigned long address; unsigned int rawcmd:2; unsigned int reset:1; unsigned int need_configure:1; unsigned int perp_mode:2; unsigned int has_fifo:1; unsigned int driver_version; unsigned char track[4]; }; defined in Linux kernel header . Since there is a fields of the structure of type 'unsigned long', there is a need to define "target_format_descr". Also, five fields rawcmd, reset, need_configure, perp_mode, and has_fifo are all just bitfields and are part od a single 'unsigned int' field. Signed-off-by: Aleksandar Markovic --- linux-user/ioctls.h | 2 ++ linux-user/syscall_defs.h | 18 ++++++++++++++++++ linux-user/syscall_types.h | 12 ++++++++++++ 3 files changed, 32 insertions(+) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index adc07ad..b3bbe6a 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -145,6 +145,8 @@ 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(FDGETFDCSTAT, IOC_R, + MK_PTR(MK_STRUCT(STRUCT_target_floppy_fdc_state))) IOCTL(FDRAWCMD, 0, TYPE_NULL) IOCTL(FDTWADDLE, 0, TYPE_NULL) IOCTL(FDEJECT, 0, TYPE_NULL) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index ae4c048..e08e5bc 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -933,6 +933,23 @@ struct target_rtc_pll_info { /* From */ +struct target_floppy_fdc_state { + int spec1; /* spec1 value last used */ + int spec2; /* spec2 value last used */ + int dtr; + unsigned char version; /* FDC version code */ + unsigned char dor; + abi_ulong address; /* io address */ + unsigned int rawcmd:2; + unsigned int reset:1; + unsigned int need_configure:1; + unsigned int perp_mode:2; + unsigned int has_fifo:1; + unsigned int driver_version; /* version code for floppy driver */ + unsigned char track[4]; +}; + + #define TARGET_FDMSGON TARGET_IO(2, 0x45) #define TARGET_FDMSGOFF TARGET_IO(2, 0x46) #define TARGET_FDFMTBEG TARGET_IO(2, 0x47) @@ -943,6 +960,7 @@ struct target_rtc_pll_info { #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_FDGETFDCSTAT TARGET_IOR(2, 0x15, struct target_floppy_fdc_state) #define TARGET_FDRAWCMD TARGET_IO(2, 0x58) #define TARGET_FDTWADDLE TARGET_IO(2, 0x59) #define TARGET_FDEJECT TARGET_IO(2, 0x5a) diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h index dfd7608..e8f8984 100644 --- a/linux-user/syscall_types.h +++ b/linux-user/syscall_types.h @@ -303,6 +303,18 @@ STRUCT(floppy_max_errors, TYPE_INT, /* recal */ TYPE_INT) /* reporting */ +STRUCT(target_floppy_fdc_state, + TYPE_INT, /* spec1 */ + TYPE_INT, /* spec2 */ + TYPE_INT, /* dtr */ + TYPE_CHAR, /* version */ + TYPE_CHAR, /* dor */ + TYPE_ULONG, /* address */ + TYPE_INT, /* bit field for rawcmd:2, reset:1, need_configure:1, */ + /* perp_mode:2, and has_fifo:1 */ + TYPE_INT, /* driver_version */ + MK_ARRAY(TYPE_CHAR, 4)) /* track */ + #if defined(CONFIG_USBFS) /* usb device ioctls */ STRUCT(usbdevfs_ctrltransfer,