Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-07-11 06:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix previous.

Browse Source
This commit is contained in:
Maxim Poliakovski 2022-12-09 01:07:08 +01:00
commit 86b0174b13
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devices/common/ata/atadefs.h
View File

@ -69,23 +69,13 @@ enum IDE_Error : int {
BBK = 0x80 BBK = 0x80
}; };
<<<<<<< HEAD
/** Bit definition for the device control register. */ /** Bit definition for the device control register. */
enum { enum {
ATA_CTRL_nIEN = 1 << 1, ATA_CTRL_nIEN = 1 << 1,
ATA_CTRL_SRST = 1 << 2, ATA_CTRL_SRST = 1 << 2,
}; };
/** ATA commands. */
=======
/* ATA Signals */
enum IDE_Signal : int {
PDIAG = 0x22,
DASP = 0x27
};
/* ATA commands. */ /* ATA commands. */
>>>>>>> 1e9ec5d... Start ATA command support
enum IDE_Cmd : int { enum IDE_Cmd : int {
NOP = 0x00, NOP = 0x00,
RESET_ATAPI = 0x08, RESET_ATAPI = 0x08,

6
devices/common/ata/idechannel.h
View File

@ -45,14 +45,8 @@ public:
return std::unique_ptr<IdeChannel>(new IdeChannel("IDE1")); return std::unique_ptr<IdeChannel>(new IdeChannel("IDE1"));
} }
<<<<<<< HEAD
uint32_t read(const uint8_t reg_addr, const int size); uint32_t read(const uint8_t reg_addr, const int size);
void write(const uint8_t reg_addr, const uint32_t val, const int size); void write(const uint8_t reg_addr, const uint32_t val, const int size);
=======
uint16_t read(const uint8_t reg_addr, const int size);
void write(const uint8_t reg_addr, const uint16_t val, const int size);
//void talk_to_channel(std::string name)
>>>>>>> 1e9ec5d... Start ATA command support
private: private:
int cur_dev = 0; int cur_dev = 0;