RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 11:15:06 +00:00
Code Issues Activity Actions

PATA: LBA48 uses 16 bit features register

Browse source
This commit is contained in:
Tom 2020-06-29 17:13:26 -06:00 • committed by Andreas Kling
parent 96109e9776
commit a2fd824dff
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Devices/PATAChannel.cpp
View file

@ -294,15 +294,11 @@ bool PATAChannel::ata_read_sectors_with_dma(u32 lba, u16 count, u8* outbuf, bool
while (m_io_base.offset(ATA_REG_STATUS).in<u8>() & ATA_SR_BSY) while (m_io_base.offset(ATA_REG_STATUS).in<u8>() & ATA_SR_BSY)
; ;
u8 devsel = 0xe0;
if (slave_request)
devsel |= 0x10;
m_control_base.offset(ATA_CTL_CONTROL).out<u8>(0); m_control_base.offset(ATA_CTL_CONTROL).out<u8>(0);
m_io_base.offset(ATA_REG_HDDEVSEL).out<u8>(devsel | (static_cast<u8>(slave_request) << 4)); m_io_base.offset(ATA_REG_HDDEVSEL).out<u8>(0x40 | (static_cast<u8>(slave_request) << 4));
io_delay(); io_delay();
m_io_base.offset(ATA_REG_FEATURES).out<u8>(0); m_io_base.offset(ATA_REG_FEATURES).out<u16>(0);
m_io_base.offset(ATA_REG_SECCOUNT0).out<u8>(0); m_io_base.offset(ATA_REG_SECCOUNT0).out<u8>(0);
m_io_base.offset(ATA_REG_LBA0).out<u8>(0); m_io_base.offset(ATA_REG_LBA0).out<u8>(0);
@ -365,15 +361,11 @@ bool PATAChannel::ata_write_sectors_with_dma(u32 lba, u16 count, const u8* inbuf
while (m_io_base.offset(ATA_REG_STATUS).in<u8>() & ATA_SR_BSY) while (m_io_base.offset(ATA_REG_STATUS).in<u8>() & ATA_SR_BSY)
; ;
u8 devsel = 0xe0;
if (slave_request)
devsel |= 0x10;
m_control_base.offset(ATA_CTL_CONTROL).out<u8>(0); m_control_base.offset(ATA_CTL_CONTROL).out<u8>(0);
m_io_base.offset(ATA_REG_HDDEVSEL).out<u8>(devsel | (static_cast<u8>(slave_request) << 4)); m_io_base.offset(ATA_REG_HDDEVSEL).out<u8>(0x40 | (static_cast<u8>(slave_request) << 4));
io_delay(); io_delay();
m_io_base.offset(ATA_REG_FEATURES).out<u8>(0); m_io_base.offset(ATA_REG_FEATURES).out<u16>(0);
m_io_base.offset(ATA_REG_SECCOUNT0).out<u8>(0); m_io_base.offset(ATA_REG_SECCOUNT0).out<u8>(0);
m_io_base.offset(ATA_REG_LBA0).out<u8>(0); m_io_base.offset(ATA_REG_LBA0).out<u8>(0);