SuperNovaa41/novaos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds some more io commnads; starts work on a PCI driver

Browse Source
This commit is contained in:
Nathan Singer
2025-06-08 18:22:22 -04:00
parent ac3dc4d48a
commit a776376403
5 changed files with 90 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
kernel/arch/io/io.s
View File

@ -9,8 +9,25 @@ outb:
out dx, al ; send the data to the I/O port
ret ; return to the calling function
global outb_16
outb_16:
mov ax, [esp + 8]
mov dx, [esp + 4]
out dx, ax
ret
global outb_32
outb_32:
mov eax, [esp + 8]
mov dx, [esp + 4]
out dx, eax
ret
global inb
; inb - returns a byte from the given I/O port
; inb - returns a byte from the given I/O porot
; stack: [esp + 4] The address of the I/O port
; [esp ] The return address
inb:
@ -18,9 +35,24 @@ inb:
in al, dx ; read a byte from the I/O port and store it in the al register
ret ; return the read byte
global inb_16
inb_16:
mov dx, [esp + 4]
in ax, dx
ret
global inb_32
inb_32:
mov dx, [esp + 4]
in eax, dx
ret
global io_wait
io_wait:
mov al, 0x0
out 0x80, al
ret

34
kernel/arch/pic/pci.c Normal file
View File

@ -0,0 +1,34 @@
#include <kernel/x86/io.h>
#include <kernel/x86/pci.h>
#include <stdio.h>
uint16_t pci_config_read_word(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset)
{
uint32_t address;
uint32_t lbus = (uint32_t) bus;
uint32_t lslot = (uint32_t) slot;
uint32_t lfunc = (uint32_t) func;
uint16_t tmp = 0;
address = (uint32_t) ((lbus << 16) | (lslot << 11) |
(lfunc << 8) | (offset & 0xFC) | ((uint32_t) 0x80000000));
outb_32(PCI_CONFIG_ADDRESS, address);
tmp = (uint16_t)((inb(PCI_CONFIG_DATA) >> ((offset & 2) * 8)) * 0xFFFF);
return tmp;
}
uint16_t pci_check_vendor(uint8_t bus, uint8_t slot)
{
uint16_t vendor, device;
if ((vendor = pci_config_read_word(bus, slot, 0, 0)) != 0xFFFF) {
device = pci_config_read_word(bus, slot, 0, 2);
printf("Device: %d, Vendor: %d\n", device, vendor);
}
return vendor;
}