diff options
| author | Ian Moffett <ian@osmora.org> | 2025-05-26 01:41:30 -0400 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2025-05-26 01:41:30 -0400 |
| commit | 84bb560874c6ee2e79787061e25fadca09dae8ef (patch) | |
| tree | 28e3d9e25d11e2f6ff698e1a3d7e92fc5bb0b328 /sys/dev/ic | |
| parent | 1c9c2ae74825932e4a1ec8330513b627bfc12592 (diff) | |
kernel: ahci: Add g_hba for indirect devfs access
Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ahci.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c index e59953e..59ba639 100644 --- a/sys/dev/ic/ahci.c +++ b/sys/dev/ic/ahci.c @@ -56,6 +56,7 @@ static struct bdevsw ahci_bdevsw; static struct hba_device *devs; static struct pci_device *ahci_dev; static struct timer tmr; +static struct ahci_hba g_hba; /* * Poll register to have 'bits' set/unset. @@ -620,7 +621,6 @@ sata_dev_rw(dev_t dev, struct sio_txn *sio, bool write) const size_t BSIZE = 512; struct sio_txn wr_sio; struct hba_device *devp; - struct ahci_hba *hba; size_t block_count, len; off_t block_off, read_off; char *buf; @@ -666,7 +666,7 @@ sata_dev_rw(dev_t dev, struct sio_txn *sio, bool write) wr_sio.buf = buf; wr_sio.len = block_count; wr_sio.offset = block_off; - status = ahci_sata_rw(hba, devp, &wr_sio, write); + status = ahci_sata_rw(&g_hba, devp, &wr_sio, write); if (status == 0 && !write) { read_off = sio->offset & (BSIZE - 1); memcpy(sio->buf, buf + read_off, sio->len); @@ -918,10 +918,9 @@ ahci_init(void) { struct pci_lookup lookup; int status; - struct ahci_hba hba; void *abar_vap = NULL; - hba.major = 0; + g_hba.major = 0; lookup.pci_class = 0x01; lookup.pci_subclass = 0x06; @@ -967,8 +966,8 @@ ahci_init(void) } ahci_init_pci(); - hba.io = (struct hba_memspace*)abar_vap; - ahci_hba_init(&hba); + g_hba.io = (struct hba_memspace*)abar_vap; + ahci_hba_init(&g_hba); return 0; } |