From nobody Wed Oct 23 01:28:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1728988926; cv=none; d=zohomail.com; s=zohoarc; b=aYpm10fR7VmVyYNLErtfTcyjbmk8Umw0IfcPAI+cM5qvxALopZfLQz6waK5/gaIGV7W46nX+eCxfpj6ZActS5nTW9O2fY4CFRgmWHXd/lXFN2qvgMWkEPp8whvbvbwS/SKF6b1QLm+X1gk0JO4uDleoSdqJg5HITgVEJFM/GtIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728988926; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=FSADpcLJ8UK2aq7rf/vIy52EVS/+/iZFfAAcTquNtvU=; b=Bkz0CUguLvqh7qUnMjfZMG2kZrzZLhNLssRlffopIejOcQLv7awbZ5h+LHpuDwFR7WXLg6f8CirklLl06+X+PzQdTbeE+krYpcPk4qkceB4AJEdUrtIooQR3OV3XJEcLtFdJMVhknUkDqpfXHiuwmtgrYMlcpOvJU0g61yZ1Z3A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1728988926299872.0430913219878; Tue, 15 Oct 2024 03:42:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0ewy-0006nK-Ix; Tue, 15 Oct 2024 06:38:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0ewb-0006hS-Nz for qemu-devel@nongnu.org; Tue, 15 Oct 2024 06:38:28 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t0ewY-0005ys-Ik for qemu-devel@nongnu.org; Tue, 15 Oct 2024 06:38:25 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-37d51055097so3080040f8f.3 for ; Tue, 15 Oct 2024 03:38:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d7fa7a06dsm1241635f8f.5.2024.10.15.03.38.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 03:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728988701; x=1729593501; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FSADpcLJ8UK2aq7rf/vIy52EVS/+/iZFfAAcTquNtvU=; b=S2W7D9GqXHC2k6o/YOsjViglgiUJOG6QuFNzUND2kYFziQjcLCcXQl6Iru3AwwYC6b BkDKLfHyuauEv+S3qoSJpw05T2K2y1N3+t6zwyUebVvHMlxbY93AkxCLFZT/q/CvU6Y7 m182fJrt6+rlabe05HO2VmSMNY5l7VuxVDOHu9H4vpwKDDy1rayZZsRMKfVYOWEcqySM D6I80Gg927U0kElqX9GPo7R7wkuaIbdbrbpOO0D5FTvZa2xwLs/wYMJDSJQbQymlOyeK Oe1QIXCzgXkTXjyAlCPO/pzBjO96dLPaBt1ybfabRhkpu1XkPbgRtC6meReRfaB0lhZO oloA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728988701; x=1729593501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FSADpcLJ8UK2aq7rf/vIy52EVS/+/iZFfAAcTquNtvU=; b=K252CQjw5FV5FlhoS/wCgbz/Wi17mfPrVl4KLbghvJbbdXoZfOE+qsHeQPvUE1yhi7 YbSGzr96/PgnW4K7Sy4V37vDzYv1PR709To8eJ1purrYdwS1GMho6YrzheDzMdEPUWno BOI0kgMFnGV0YqBwd8mzETOV/ZHE0aRwkEvQNR6+n3vG/WMyzxzPIjqxeTMnUp8F7PV8 cHWD8BDFQ46N4/BlvnoHyqrKkYgUYHLgYTq7YqAogmB6TRXWh4aAH7orTj9rVD0fpx6S 0s1251mhEttswgsB2SZfK22hwiGOYlGu948HjbEOMgSK58ged4JwoNuQcQplvZjfIEl8 qVYw== X-Gm-Message-State: AOJu0YzpzNJ0emzuvTOjbVqdicNKVYVqWseAB7QEyZ6111+nmzJUq823 B2uUAQ67KXvIet7bwADzgFNFbYorK7nqZ9ggdC+Raoi4if8cr1TzFjvnyI9pk0j7NxAIb0KQjjL Y X-Google-Smtp-Source: AGHT+IHNm5r535LdnA4KaURSK0lRCO2r42GetanMS11LpFMyQBGp3YMOU4jaobZ03mrfBGxFAkyiMQ== X-Received: by 2002:a5d:4742:0:b0:374:fa0a:773c with SMTP id ffacd0b85a97d-37d5ffc1a53mr8284537f8f.47.1728988700937; Tue, 15 Oct 2024 03:38:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/28] hw/ide: Remove DSCM-1XXXX microdrive device model Date: Tue, 15 Oct 2024 11:38:03 +0100 Message-Id: <20241015103808.133024-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241015103808.133024-1-peter.maydell@linaro.org> References: <20241015103808.133024-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1728988927401116600 The DSCM-1XXXX microdrive device model was used only by the XScale-based Zaurus machine types. Now they have been removed, we can delete this device too. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20241003140010.1653808-4-peter.maydell@linaro.org --- include/hw/pcmcia.h | 3 - hw/ide/microdrive.c | 644 -------------------------------------------- hw/ide/Kconfig | 6 - hw/ide/meson.build | 1 - 4 files changed, 654 deletions(-) delete mode 100644 hw/ide/microdrive.c diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h index ab268027511..6c08ad616a5 100644 --- a/include/hw/pcmcia.h +++ b/include/hw/pcmcia.h @@ -60,7 +60,4 @@ struct PCMCIACardClass { #define CISTPL_END 0xff /* Tuple End */ #define CISTPL_ENDMARK 0xff =20 -/* dscm1xxxx.c */ -PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv); - #endif diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c deleted file mode 100644 index 5475d599788..00000000000 --- a/hw/ide/microdrive.c +++ /dev/null @@ -1,644 +0,0 @@ -/* - * QEMU IDE Emulation: microdrive (CF / PCMCIA) - * - * Copyright (c) 2003 Fabrice Bellard - * Copyright (c) 2006 Openedhand Ltd. - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "hw/pcmcia.h" -#include "migration/vmstate.h" -#include "qapi/error.h" -#include "qemu/module.h" -#include "sysemu/dma.h" -#include "hw/irq.h" - -#include "qom/object.h" -#include "ide-internal.h" - -#define TYPE_MICRODRIVE "microdrive" -OBJECT_DECLARE_SIMPLE_TYPE(MicroDriveState, MICRODRIVE) - -/***********************************************************/ -/* CF-ATA Microdrive */ - -#define METADATA_SIZE 0x20 - -/* DSCM-1XXXX Microdrive hard disk with CF+ II / PCMCIA interface. */ - -struct MicroDriveState { - /*< private >*/ - PCMCIACardState parent_obj; - /*< public >*/ - - IDEBus bus; - uint32_t attr_base; - uint32_t io_base; - - /* Card state */ - uint8_t opt; - uint8_t stat; - uint8_t pins; - - uint8_t ctrl; - uint16_t io; - uint8_t cycle; -}; - -/* Register bitfields */ -enum md_opt { - OPT_MODE_MMAP =3D 0, - OPT_MODE_IOMAP16 =3D 1, - OPT_MODE_IOMAP1 =3D 2, - OPT_MODE_IOMAP2 =3D 3, - OPT_MODE =3D 0x3f, - OPT_LEVIREQ =3D 0x40, - OPT_SRESET =3D 0x80, -}; -enum md_cstat { - STAT_INT =3D 0x02, - STAT_PWRDWN =3D 0x04, - STAT_XE =3D 0x10, - STAT_IOIS8 =3D 0x20, - STAT_SIGCHG =3D 0x40, - STAT_CHANGED =3D 0x80, -}; -enum md_pins { - PINS_MRDY =3D 0x02, - PINS_CRDY =3D 0x20, -}; -enum md_ctrl { - CTRL_IEN =3D 0x02, - CTRL_SRST =3D 0x04, -}; - -static inline void md_interrupt_update(MicroDriveState *s) -{ - PCMCIACardState *card =3D PCMCIA_CARD(s); - - if (card->slot =3D=3D NULL) { - return; - } - - qemu_set_irq(card->slot->irq, - !(s->stat & STAT_INT) && /* Inverted */ - !(s->ctrl & (CTRL_IEN | CTRL_SRST)) && - !(s->opt & OPT_SRESET)); -} - -static void md_set_irq(void *opaque, int irq, int level) -{ - MicroDriveState *s =3D opaque; - - if (level) { - s->stat |=3D STAT_INT; - } else { - s->stat &=3D ~STAT_INT; - } - - md_interrupt_update(s); -} - -static void md_reset(DeviceState *dev) -{ - MicroDriveState *s =3D MICRODRIVE(dev); - - s->opt =3D OPT_MODE_MMAP; - s->stat =3D 0; - s->pins =3D 0; - s->cycle =3D 0; - s->ctrl =3D 0; - ide_bus_reset(&s->bus); -} - -static uint8_t md_attr_read(PCMCIACardState *card, uint32_t at) -{ - MicroDriveState *s =3D MICRODRIVE(card); - PCMCIACardClass *pcc =3D PCMCIA_CARD_GET_CLASS(card); - - if (at < s->attr_base) { - if (at < pcc->cis_len) { - return pcc->cis[at]; - } else { - return 0x00; - } - } - - at -=3D s->attr_base; - - switch (at) { - case 0x00: /* Configuration Option Register */ - return s->opt; - case 0x02: /* Card Configuration Status Register */ - if (s->ctrl & CTRL_IEN) { - return s->stat & ~STAT_INT; - } else { - return s->stat; - } - case 0x04: /* Pin Replacement Register */ - return (s->pins & PINS_CRDY) | 0x0c; - case 0x06: /* Socket and Copy Register */ - return 0x00; -#ifdef VERBOSE - default: - printf("%s: Bad attribute space register %02x\n", __func__, at); -#endif - } - - return 0; -} - -static void md_attr_write(PCMCIACardState *card, uint32_t at, uint8_t valu= e) -{ - MicroDriveState *s =3D MICRODRIVE(card); - - at -=3D s->attr_base; - - switch (at) { - case 0x00: /* Configuration Option Register */ - s->opt =3D value & 0xcf; - if (value & OPT_SRESET) { - device_cold_reset(DEVICE(s)); - } - md_interrupt_update(s); - break; - case 0x02: /* Card Configuration Status Register */ - if ((s->stat ^ value) & STAT_PWRDWN) { - s->pins |=3D PINS_CRDY; - } - s->stat &=3D 0x82; - s->stat |=3D value & 0x74; - md_interrupt_update(s); - /* Word 170 in Identify Device must be equal to STAT_XE */ - break; - case 0x04: /* Pin Replacement Register */ - s->pins &=3D PINS_CRDY; - s->pins |=3D value & PINS_MRDY; - break; - case 0x06: /* Socket and Copy Register */ - break; - default: - printf("%s: Bad attribute space register %02x\n", __func__, at); - } -} - -static uint16_t md_common_read(PCMCIACardState *card, uint32_t at) -{ - MicroDriveState *s =3D MICRODRIVE(card); - IDEState *ifs; - uint16_t ret; - at -=3D s->io_base; - - switch (s->opt & OPT_MODE) { - case OPT_MODE_MMAP: - if ((at & ~0x3ff) =3D=3D 0x400) { - at =3D 0; - } - break; - case OPT_MODE_IOMAP16: - at &=3D 0xf; - break; - case OPT_MODE_IOMAP1: - if ((at & ~0xf) =3D=3D 0x3f0) { - at -=3D 0x3e8; - } else if ((at & ~0xf) =3D=3D 0x1f0) { - at -=3D 0x1f0; - } - break; - case OPT_MODE_IOMAP2: - if ((at & ~0xf) =3D=3D 0x370) { - at -=3D 0x368; - } else if ((at & ~0xf) =3D=3D 0x170) { - at -=3D 0x170; - } - } - - switch (at) { - case 0x0: /* Even RD Data */ - case 0x8: - return ide_data_readw(&s->bus, 0); - - /* TODO: 8-bit accesses */ - if (s->cycle) { - ret =3D s->io >> 8; - } else { - s->io =3D ide_data_readw(&s->bus, 0); - ret =3D s->io & 0xff; - } - s->cycle =3D !s->cycle; - return ret; - case 0x9: /* Odd RD Data */ - return s->io >> 8; - case 0xd: /* Error */ - return ide_ioport_read(&s->bus, 0x1); - case 0xe: /* Alternate Status */ - ifs =3D ide_bus_active_if(&s->bus); - if (ifs->blk) { - return ifs->status; - } else { - return 0; - } - case 0xf: /* Device Address */ - ifs =3D ide_bus_active_if(&s->bus); - return 0xc2 | ((~ifs->select << 2) & 0x3c); - default: - return ide_ioport_read(&s->bus, at); - } - - return 0; -} - -static void md_common_write(PCMCIACardState *card, uint32_t at, uint16_t v= alue) -{ - MicroDriveState *s =3D MICRODRIVE(card); - at -=3D s->io_base; - - switch (s->opt & OPT_MODE) { - case OPT_MODE_MMAP: - if ((at & ~0x3ff) =3D=3D 0x400) { - at =3D 0; - } - break; - case OPT_MODE_IOMAP16: - at &=3D 0xf; - break; - case OPT_MODE_IOMAP1: - if ((at & ~0xf) =3D=3D 0x3f0) { - at -=3D 0x3e8; - } else if ((at & ~0xf) =3D=3D 0x1f0) { - at -=3D 0x1f0; - } - break; - case OPT_MODE_IOMAP2: - if ((at & ~0xf) =3D=3D 0x370) { - at -=3D 0x368; - } else if ((at & ~0xf) =3D=3D 0x170) { - at -=3D 0x170; - } - } - - switch (at) { - case 0x0: /* Even WR Data */ - case 0x8: - ide_data_writew(&s->bus, 0, value); - break; - - /* TODO: 8-bit accesses */ - if (s->cycle) { - ide_data_writew(&s->bus, 0, s->io | (value << 8)); - } else { - s->io =3D value & 0xff; - } - s->cycle =3D !s->cycle; - break; - case 0x9: - s->io =3D value & 0xff; - s->cycle =3D !s->cycle; - break; - case 0xd: /* Features */ - ide_ioport_write(&s->bus, 0x1, value); - break; - case 0xe: /* Device Control */ - s->ctrl =3D value; - if (value & CTRL_SRST) { - device_cold_reset(DEVICE(s)); - } - md_interrupt_update(s); - break; - default: - if (s->stat & STAT_PWRDWN) { - s->pins |=3D PINS_CRDY; - s->stat &=3D ~STAT_PWRDWN; - } - ide_ioport_write(&s->bus, at, value); - } -} - -static const VMStateDescription vmstate_microdrive =3D { - .name =3D "microdrive", - .version_id =3D 3, - .minimum_version_id =3D 0, - .fields =3D (const VMStateField[]) { - VMSTATE_UINT8(opt, MicroDriveState), - VMSTATE_UINT8(stat, MicroDriveState), - VMSTATE_UINT8(pins, MicroDriveState), - VMSTATE_UINT8(ctrl, MicroDriveState), - VMSTATE_UINT16(io, MicroDriveState), - VMSTATE_UINT8(cycle, MicroDriveState), - VMSTATE_IDE_BUS(bus, MicroDriveState), - VMSTATE_IDE_DRIVES(bus.ifs, MicroDriveState), - VMSTATE_END_OF_LIST() - } -}; - -static const uint8_t dscm1xxxx_cis[0x14a] =3D { - [0x000] =3D CISTPL_DEVICE, /* 5V Device Information */ - [0x002] =3D 0x03, /* Tuple length =3D 4 bytes */ - [0x004] =3D 0xdb, /* ID: DTYPE_FUNCSPEC, non WP, DSPEED_15= 0NS */ - [0x006] =3D 0x01, /* Size =3D 2K bytes */ - [0x008] =3D CISTPL_ENDMARK, - - [0x00a] =3D CISTPL_DEVICE_OC, /* Additional Device Information */ - [0x00c] =3D 0x04, /* Tuple length =3D 4 byest */ - [0x00e] =3D 0x03, /* Conditions: Ext =3D 0, Vcc 3.3V, MWAI= T =3D 1 */ - [0x010] =3D 0xdb, /* ID: DTYPE_FUNCSPEC, non WP, DSPEED_15= 0NS */ - [0x012] =3D 0x01, /* Size =3D 2K bytes */ - [0x014] =3D CISTPL_ENDMARK, - - [0x016] =3D CISTPL_JEDEC_C, /* JEDEC ID */ - [0x018] =3D 0x02, /* Tuple length =3D 2 bytes */ - [0x01a] =3D 0xdf, /* PC Card ATA with no Vpp required */ - [0x01c] =3D 0x01, - - [0x01e] =3D CISTPL_MANFID, /* Manufacture ID */ - [0x020] =3D 0x04, /* Tuple length =3D 4 bytes */ - [0x022] =3D 0xa4, /* TPLMID_MANF =3D 00a4 (IBM) */ - [0x024] =3D 0x00, - [0x026] =3D 0x00, /* PLMID_CARD =3D 0000 */ - [0x028] =3D 0x00, - - [0x02a] =3D CISTPL_VERS_1, /* Level 1 Version */ - [0x02c] =3D 0x12, /* Tuple length =3D 23 bytes */ - [0x02e] =3D 0x04, /* Major Version =3D JEIDA 4.2 / PCMCIA = 2.1 */ - [0x030] =3D 0x01, /* Minor Version =3D 1 */ - [0x032] =3D 'I', - [0x034] =3D 'B', - [0x036] =3D 'M', - [0x038] =3D 0x00, - [0x03a] =3D 'm', - [0x03c] =3D 'i', - [0x03e] =3D 'c', - [0x040] =3D 'r', - [0x042] =3D 'o', - [0x044] =3D 'd', - [0x046] =3D 'r', - [0x048] =3D 'i', - [0x04a] =3D 'v', - [0x04c] =3D 'e', - [0x04e] =3D 0x00, - [0x050] =3D CISTPL_ENDMARK, - - [0x052] =3D CISTPL_FUNCID, /* Function ID */ - [0x054] =3D 0x02, /* Tuple length =3D 2 bytes */ - [0x056] =3D 0x04, /* TPLFID_FUNCTION =3D Fixed Disk */ - [0x058] =3D 0x01, /* TPLFID_SYSINIT: POST =3D 1, ROM =3D 0= */ - - [0x05a] =3D CISTPL_FUNCE, /* Function Extension */ - [0x05c] =3D 0x02, /* Tuple length =3D 2 bytes */ - [0x05e] =3D 0x01, /* TPLFE_TYPE =3D Disk Device Interface = */ - [0x060] =3D 0x01, /* TPLFE_DATA =3D PC Card ATA Interface = */ - - [0x062] =3D CISTPL_FUNCE, /* Function Extension */ - [0x064] =3D 0x03, /* Tuple length =3D 3 bytes */ - [0x066] =3D 0x02, /* TPLFE_TYPE =3D Basic PC Card ATA Inte= rface */ - [0x068] =3D 0x08, /* TPLFE_DATA: Rotating, Unique, Single = */ - [0x06a] =3D 0x0f, /* TPLFE_DATA: Sleep, Standby, Idle, Aut= o */ - - [0x06c] =3D CISTPL_CONFIG, /* Configuration */ - [0x06e] =3D 0x05, /* Tuple length =3D 5 bytes */ - [0x070] =3D 0x01, /* TPCC_RASZ =3D 2 bytes, TPCC_RMSZ =3D = 1 byte */ - [0x072] =3D 0x07, /* TPCC_LAST =3D 7 */ - [0x074] =3D 0x00, /* TPCC_RADR =3D 0200 */ - [0x076] =3D 0x02, - [0x078] =3D 0x0f, /* TPCC_RMSK =3D 200, 202, 204, 206 */ - - [0x07a] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x07c] =3D 0x0b, /* Tuple length =3D 11 bytes */ - [0x07e] =3D 0xc0, /* TPCE_INDX =3D Memory Mode, Default, I= face */ - [0x080] =3D 0xc0, /* TPCE_IF =3D Memory, no BVDs, no WP, R= EADY */ - [0x082] =3D 0xa1, /* TPCE_FS =3D Vcc only, no I/O, Memory,= Misc */ - [0x084] =3D 0x27, /* NomV =3D 1, MinV =3D 1, MaxV =3D 1, P= eakl =3D 1 */ - [0x086] =3D 0x55, /* NomV: 5.0 V */ - [0x088] =3D 0x4d, /* MinV: 4.5 V */ - [0x08a] =3D 0x5d, /* MaxV: 5.5 V */ - [0x08c] =3D 0x4e, /* Peakl: 450 mA */ - [0x08e] =3D 0x08, /* TPCE_MS =3D 1 window, 1 byte, Host ad= dress */ - [0x090] =3D 0x00, /* Window descriptor: Window length =3D = 0 */ - [0x092] =3D 0x20, /* TPCE_MI: support power down mode, RW = */ - - [0x094] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x096] =3D 0x06, /* Tuple length =3D 6 bytes */ - [0x098] =3D 0x00, /* TPCE_INDX =3D Memory Mode, no Default= */ - [0x09a] =3D 0x01, /* TPCE_FS =3D Vcc only, no I/O, no Memo= ry */ - [0x09c] =3D 0x21, /* NomV =3D 1, MinV =3D 0, MaxV =3D 0, P= eakl =3D 1 */ - [0x09e] =3D 0xb5, /* NomV: 3.3 V */ - [0x0a0] =3D 0x1e, - [0x0a2] =3D 0x3e, /* Peakl: 350 mA */ - - [0x0a4] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x0a6] =3D 0x0d, /* Tuple length =3D 13 bytes */ - [0x0a8] =3D 0xc1, /* TPCE_INDX =3D I/O and Memory Mode, De= fault */ - [0x0aa] =3D 0x41, /* TPCE_IF =3D I/O and Memory, no BVD, n= o WP */ - [0x0ac] =3D 0x99, /* TPCE_FS =3D Vcc only, I/O, Interrupt,= Misc */ - [0x0ae] =3D 0x27, /* NomV =3D 1, MinV =3D 1, MaxV =3D 1, P= eakl =3D 1 */ - [0x0b0] =3D 0x55, /* NomV: 5.0 V */ - [0x0b2] =3D 0x4d, /* MinV: 4.5 V */ - [0x0b4] =3D 0x5d, /* MaxV: 5.5 V */ - [0x0b6] =3D 0x4e, /* Peakl: 450 mA */ - [0x0b8] =3D 0x64, /* TPCE_IO =3D 16-byte boundary, 16/8 ac= cesses */ - [0x0ba] =3D 0xf0, /* TPCE_IR =3D MASK, Level, Pulse, Shar= e */ - [0x0bc] =3D 0xff, /* IRQ0..IRQ7 supported */ - [0x0be] =3D 0xff, /* IRQ8..IRQ15 supported */ - [0x0c0] =3D 0x20, /* TPCE_MI =3D support power down mode */ - - [0x0c2] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x0c4] =3D 0x06, /* Tuple length =3D 6 bytes */ - [0x0c6] =3D 0x01, /* TPCE_INDX =3D I/O and Memory Mode */ - [0x0c8] =3D 0x01, /* TPCE_FS =3D Vcc only, no I/O, no Memo= ry */ - [0x0ca] =3D 0x21, /* NomV =3D 1, MinV =3D 0, MaxV =3D 0, P= eakl =3D 1 */ - [0x0cc] =3D 0xb5, /* NomV: 3.3 V */ - [0x0ce] =3D 0x1e, - [0x0d0] =3D 0x3e, /* Peakl: 350 mA */ - - [0x0d2] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x0d4] =3D 0x12, /* Tuple length =3D 18 bytes */ - [0x0d6] =3D 0xc2, /* TPCE_INDX =3D I/O Primary Mode */ - [0x0d8] =3D 0x41, /* TPCE_IF =3D I/O and Memory, no BVD, n= o WP */ - [0x0da] =3D 0x99, /* TPCE_FS =3D Vcc only, I/O, Interrupt,= Misc */ - [0x0dc] =3D 0x27, /* NomV =3D 1, MinV =3D 1, MaxV =3D 1, P= eakl =3D 1 */ - [0x0de] =3D 0x55, /* NomV: 5.0 V */ - [0x0e0] =3D 0x4d, /* MinV: 4.5 V */ - [0x0e2] =3D 0x5d, /* MaxV: 5.5 V */ - [0x0e4] =3D 0x4e, /* Peakl: 450 mA */ - [0x0e6] =3D 0xea, /* TPCE_IO =3D 1K boundary, 16/8 access,= Range */ - [0x0e8] =3D 0x61, /* Range: 2 fields, 2 bytes addr, 1 byte= len */ - [0x0ea] =3D 0xf0, /* Field 1 address =3D 0x01f0 */ - [0x0ec] =3D 0x01, - [0x0ee] =3D 0x07, /* Address block length =3D 8 */ - [0x0f0] =3D 0xf6, /* Field 2 address =3D 0x03f6 */ - [0x0f2] =3D 0x03, - [0x0f4] =3D 0x01, /* Address block length =3D 2 */ - [0x0f6] =3D 0xee, /* TPCE_IR =3D IRQ E, Level, Pulse, Shar= e */ - [0x0f8] =3D 0x20, /* TPCE_MI =3D support power down mode */ - - [0x0fa] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x0fc] =3D 0x06, /* Tuple length =3D 6 bytes */ - [0x0fe] =3D 0x02, /* TPCE_INDX =3D I/O Primary Mode, no De= fault */ - [0x100] =3D 0x01, /* TPCE_FS =3D Vcc only, no I/O, no Memo= ry */ - [0x102] =3D 0x21, /* NomV =3D 1, MinV =3D 0, MaxV =3D 0, P= eakl =3D 1 */ - [0x104] =3D 0xb5, /* NomV: 3.3 V */ - [0x106] =3D 0x1e, - [0x108] =3D 0x3e, /* Peakl: 350 mA */ - - [0x10a] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x10c] =3D 0x12, /* Tuple length =3D 18 bytes */ - [0x10e] =3D 0xc3, /* TPCE_INDX =3D I/O Secondary Mode, Def= ault */ - [0x110] =3D 0x41, /* TPCE_IF =3D I/O and Memory, no BVD, n= o WP */ - [0x112] =3D 0x99, /* TPCE_FS =3D Vcc only, I/O, Interrupt,= Misc */ - [0x114] =3D 0x27, /* NomV =3D 1, MinV =3D 1, MaxV =3D 1, P= eakl =3D 1 */ - [0x116] =3D 0x55, /* NomV: 5.0 V */ - [0x118] =3D 0x4d, /* MinV: 4.5 V */ - [0x11a] =3D 0x5d, /* MaxV: 5.5 V */ - [0x11c] =3D 0x4e, /* Peakl: 450 mA */ - [0x11e] =3D 0xea, /* TPCE_IO =3D 1K boundary, 16/8 access,= Range */ - [0x120] =3D 0x61, /* Range: 2 fields, 2 byte addr, 1 byte = len */ - [0x122] =3D 0x70, /* Field 1 address =3D 0x0170 */ - [0x124] =3D 0x01, - [0x126] =3D 0x07, /* Address block length =3D 8 */ - [0x128] =3D 0x76, /* Field 2 address =3D 0x0376 */ - [0x12a] =3D 0x03, - [0x12c] =3D 0x01, /* Address block length =3D 2 */ - [0x12e] =3D 0xee, /* TPCE_IR =3D IRQ E, Level, Pulse, Shar= e */ - [0x130] =3D 0x20, /* TPCE_MI =3D support power down mode */ - - [0x132] =3D CISTPL_CFTABLE_ENTRY, /* 16-bit PC Card Configuration */ - [0x134] =3D 0x06, /* Tuple length =3D 6 bytes */ - [0x136] =3D 0x03, /* TPCE_INDX =3D I/O Secondary Mode */ - [0x138] =3D 0x01, /* TPCE_FS =3D Vcc only, no I/O, no Memo= ry */ - [0x13a] =3D 0x21, /* NomV =3D 1, MinV =3D 0, MaxV =3D 0, P= eakl =3D 1 */ - [0x13c] =3D 0xb5, /* NomV: 3.3 V */ - [0x13e] =3D 0x1e, - [0x140] =3D 0x3e, /* Peakl: 350 mA */ - - [0x142] =3D CISTPL_NO_LINK, /* No Link */ - [0x144] =3D 0x00, /* Tuple length =3D 0 bytes */ - - [0x146] =3D CISTPL_END, /* Tuple End */ -}; - -#define TYPE_DSCM1XXXX "dscm1xxxx" - -static int dscm1xxxx_attach(PCMCIACardState *card) -{ - MicroDriveState *md =3D MICRODRIVE(card); - PCMCIACardClass *pcc =3D PCMCIA_CARD_GET_CLASS(card); - - md->attr_base =3D pcc->cis[0x74] | (pcc->cis[0x76] << 8); - md->io_base =3D 0x0; - - device_cold_reset(DEVICE(md)); - md_interrupt_update(md); - - return 0; -} - -static int dscm1xxxx_detach(PCMCIACardState *card) -{ - MicroDriveState *md =3D MICRODRIVE(card); - - device_cold_reset(DEVICE(md)); - return 0; -} - -PCMCIACardState *dscm1xxxx_init(DriveInfo *dinfo) -{ - MicroDriveState *md; - - md =3D MICRODRIVE(object_new(TYPE_DSCM1XXXX)); - qdev_realize(DEVICE(md), NULL, &error_fatal); - - if (dinfo !=3D NULL) { - ide_bus_create_drive(&md->bus, 0, dinfo); - } - md->bus.ifs[0].drive_kind =3D IDE_CFATA; - md->bus.ifs[0].mdata_size =3D METADATA_SIZE; - md->bus.ifs[0].mdata_storage =3D g_malloc0(METADATA_SIZE); - - return PCMCIA_CARD(md); -} - -static void dscm1xxxx_class_init(ObjectClass *oc, void *data) -{ - PCMCIACardClass *pcc =3D PCMCIA_CARD_CLASS(oc); - DeviceClass *dc =3D DEVICE_CLASS(oc); - - pcc->cis =3D dscm1xxxx_cis; - pcc->cis_len =3D sizeof(dscm1xxxx_cis); - - pcc->attach =3D dscm1xxxx_attach; - pcc->detach =3D dscm1xxxx_detach; - /* Reason: Needs to be wired-up in code, see dscm1xxxx_init() */ - dc->user_creatable =3D false; -} - -static const TypeInfo dscm1xxxx_type_info =3D { - .name =3D TYPE_DSCM1XXXX, - .parent =3D TYPE_MICRODRIVE, - .class_init =3D dscm1xxxx_class_init, -}; - -static void microdrive_realize(DeviceState *dev, Error **errp) -{ - MicroDriveState *md =3D MICRODRIVE(dev); - - ide_bus_init_output_irq(&md->bus, qemu_allocate_irq(md_set_irq, md, 0)= ); -} - -static void microdrive_init(Object *obj) -{ - MicroDriveState *md =3D MICRODRIVE(obj); - - ide_bus_init(&md->bus, sizeof(md->bus), DEVICE(obj), 0, 1); -} - -static void microdrive_class_init(ObjectClass *oc, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(oc); - PCMCIACardClass *pcc =3D PCMCIA_CARD_CLASS(oc); - - pcc->attr_read =3D md_attr_read; - pcc->attr_write =3D md_attr_write; - pcc->common_read =3D md_common_read; - pcc->common_write =3D md_common_write; - pcc->io_read =3D md_common_read; - pcc->io_write =3D md_common_write; - - dc->realize =3D microdrive_realize; - device_class_set_legacy_reset(dc, md_reset); - dc->vmsd =3D &vmstate_microdrive; -} - -static const TypeInfo microdrive_type_info =3D { - .name =3D TYPE_MICRODRIVE, - .parent =3D TYPE_PCMCIA_CARD, - .instance_size =3D sizeof(MicroDriveState), - .instance_init =3D microdrive_init, - .abstract =3D true, - .class_init =3D microdrive_class_init, -}; - -static void microdrive_register_types(void) -{ - type_register_static(µdrive_type_info); - type_register_static(&dscm1xxxx_type_info); -} - -type_init(microdrive_register_types) diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 6dfc5a21292..2e22b677da3 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -43,12 +43,6 @@ config IDE_VIA bool select IDE_PCI =20 -config MICRODRIVE - bool - select IDE_BUS - select IDE_DEV - depends on PCMCIA - config AHCI bool select IDE_BUS diff --git a/hw/ide/meson.build b/hw/ide/meson.build index d09705cac03..90ea8614233 100644 --- a/hw/ide/meson.build +++ b/hw/ide/meson.build @@ -13,4 +13,3 @@ system_ss.add(when: 'CONFIG_IDE_PCI', if_true: files('pci= .c')) system_ss.add(when: 'CONFIG_IDE_PIIX', if_true: files('piix.c', 'ioport.c'= )) system_ss.add(when: 'CONFIG_IDE_SII3112', if_true: files('sii3112.c')) system_ss.add(when: 'CONFIG_IDE_VIA', if_true: files('via.c')) -system_ss.add(when: 'CONFIG_MICRODRIVE', if_true: files('microdrive.c')) --=20 2.34.1