dev: Move storage devices to src/dev/storage/

Move the IDE controller and the disk implementations to
src/dev/storage.

--HG--
rename : src/dev/DiskImage.py => src/dev/storage/DiskImage.py
rename : src/dev/Ide.py => src/dev/storage/Ide.py
rename : src/dev/SimpleDisk.py => src/dev/storage/SimpleDisk.py
rename : src/dev/disk_image.cc => src/dev/storage/disk_image.cc
rename : src/dev/disk_image.hh => src/dev/storage/disk_image.hh
rename : src/dev/ide_atareg.h => src/dev/storage/ide_atareg.h
rename : src/dev/ide_ctrl.cc => src/dev/storage/ide_ctrl.cc
rename : src/dev/ide_ctrl.hh => src/dev/storage/ide_ctrl.hh
rename : src/dev/ide_disk.cc => src/dev/storage/ide_disk.cc
rename : src/dev/ide_disk.hh => src/dev/storage/ide_disk.hh
rename : src/dev/ide_wdcreg.h => src/dev/storage/ide_wdcreg.h
rename : src/dev/simple_disk.cc => src/dev/storage/simple_disk.cc
rename : src/dev/simple_disk.hh => src/dev/storage/simple_disk.hh

1 files changed, 0 insertions, 159 deletions

diff --git a/src/dev/ide_ctrl.hh b/src/dev/ide_ctrl.hh
deleted file mode 100644
index c6c4beecc..000000000
--- a/src/dev/ide_ctrl.hh
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Andrew Schultz
- *          Miguel Serrano
- */
-
-/** @file
- * Simple PCI IDE controller with bus mastering capability and UDMA
- * modeled after controller in the Intel PIIX4 chip
- */
-
-#ifndef __IDE_CTRL_HH__
-#define __IDE_CTRL_HH__
-
-#include "base/bitunion.hh"
-#include "dev/io_device.hh"
-#include "dev/pci/device.hh"
-#include "params/IdeController.hh"
-
-class IdeDisk;
-
-/**
- * Device model for an Intel PIIX4 IDE controller
- */
-
-class IdeController : public PciDevice
-{
-  private:
-    // Bus master IDE status register bit fields
-    BitUnion8(BMIStatusReg)
-        Bitfield<6> dmaCap0;
-        Bitfield<5> dmaCap1;
-        Bitfield<2> intStatus;
-        Bitfield<1> dmaError;
-        Bitfield<0> active;
-    EndBitUnion(BMIStatusReg)
-
-    BitUnion8(BMICommandReg)
-        Bitfield<3> rw;
-        Bitfield<0> startStop;
-    EndBitUnion(BMICommandReg)
-
-    struct Channel
-    {
-        std::string _name;
-
-        const std::string
-        name()
-        {
-            return _name;
-        }
-
-        /** Command and control block registers */
-        Addr cmdAddr, cmdSize, ctrlAddr, ctrlSize;
-
-        /** Registers used for bus master interface */
-        struct BMIRegs
-        {
-            BMICommandReg command;
-            uint8_t reserved0;
-            BMIStatusReg status;
-            uint8_t reserved1;
-            uint32_t bmidtp;
-        } bmiRegs;
-
-        /** IDE disks connected to this controller */
-        IdeDisk *master, *slave;
-
-        /** Currently selected disk */
-        IdeDisk *selected;
-
-        bool selectBit;
-
-        void
-        select(bool selSlave)
-        {
-            selectBit = selSlave;
-            selected = selectBit ? slave : master;
-        }
-
-        void accessCommand(Addr offset, int size, uint8_t *data, bool read);
-        void accessControl(Addr offset, int size, uint8_t *data, bool read);
-        void accessBMI(Addr offset, int size, uint8_t *data, bool read);
-
-        Channel(std::string newName, Addr _cmdSize, Addr _ctrlSize);
-        ~Channel();
-
-        void serialize(const std::string &base, std::ostream &os) const;
-        void unserialize(const std::string &base, CheckpointIn &cp);
-    };
-
-    Channel primary;
-    Channel secondary;
-
-    /** Bus master interface (BMI) registers */
-    Addr bmiAddr, bmiSize;
-
-    /** Registers used in device specific PCI configuration */
-    uint16_t primaryTiming, secondaryTiming;
-    uint8_t deviceTiming;
-    uint8_t udmaControl;
-    uint16_t udmaTiming;
-    uint16_t ideConfig;
-
-    // Internal management variables
-    bool ioEnabled;
-    bool bmEnabled;
-
-    uint32_t ioShift, ctrlOffset;
-
-    void dispatchAccess(PacketPtr pkt, bool read);
-
-  public:
-    typedef IdeControllerParams Params;
-    const Params *params() const { return (const Params *)_params; }
-    IdeController(Params *p);
-
-    /** See if a disk is selected based on its pointer */
-    bool isDiskSelected(IdeDisk *diskPtr);
-
-    void intrPost();
-
-    Tick writeConfig(PacketPtr pkt) override;
-    Tick readConfig(PacketPtr pkt) override;
-
-    void setDmaComplete(IdeDisk *disk);
-
-    Tick read(PacketPtr pkt) override;
-    Tick write(PacketPtr pkt) override;
-
-    void serialize(CheckpointOut &cp) const override;
-    void unserialize(CheckpointIn &cp) override;
-};
-#endif // __IDE_CTRL_HH_