Compare commits
No commits in common. "a904ffaaad2efdda87fbbe4dc1ef1cd56e6dfa19" and "389868e8489188bf19a42155e7ca988d46d49233" have entirely different histories.
a904ffaaad
...
389868e848
|
|
@ -1,4 +1,3 @@
|
|||
build
|
||||
cmake-build-debug
|
||||
noxos.log
|
||||
*.img # For test disk images
|
||||
noxos.log
|
||||
|
|
@ -1,7 +1,215 @@
|
|||
|
||||
#ifndef NOXOS_PCI_H
|
||||
#define NOXOS_PCI_H
|
||||
#ifndef NOXOS_pci_H
|
||||
#define NOXOS_pci_H
|
||||
|
||||
#include <drivers/acpi/acpi.h>
|
||||
|
||||
typedef enum {
|
||||
PCI_CLASS_UNCLASSIFIED = 0x00,
|
||||
PCI_CLASS_MASS_STORAGE_CONTROLLER = 0x01,
|
||||
PCI_CLASS_NETWORK_CONTROLLER = 0x02,
|
||||
PCI_CLASS_DISPLAY_CONTROLLER = 0x03,
|
||||
PCI_CLASS_MULTIMEDIA_CONTROLLER = 0x04,
|
||||
PCI_CLASS_MEMORY_CONTROLLER = 0x05,
|
||||
PCI_CLASS_BRIDGE = 0x06,
|
||||
PCI_CLASS_SIMPLE_COMMUNICATION_CONTROLLER = 0x07,
|
||||
PCI_CLASS_BASE_SYSTEM_PERIPHERAL = 0x08,
|
||||
PCI_CLASS_INPUT_DEVICE_CONTROLLER = 0x09,
|
||||
PCI_CLASS_DOCKING_STATION = 0x0a,
|
||||
PCI_CLASS_PROCESSOR = 0x0b,
|
||||
PCI_CLASS_SERIAL_BUS_CONTROLLER = 0x0c,
|
||||
PCI_CLASS_WIRELESS_CONTROLLER = 0x0d,
|
||||
PCI_CLASS_INTELLIGENT_CONTROLLER = 0x0e,
|
||||
PCI_CLASS_SATELLITE_COMMUNICATION_CONTROLLER = 0x0f,
|
||||
PCI_CLASS_ENCRYPTION_CONTROLLER = 0x10,
|
||||
PCI_CLASS_SIGNAL_PROCESSING_CONTROLLER = 0x11,
|
||||
PCI_CLASS_PROCESSING_ACCELERATOR = 0x12,
|
||||
PCI_CLASS_NON_ESSENTIAL_INSTRUMENTATION = 0x13,
|
||||
PCI_CLASS_COPROCESSOR = 0x40
|
||||
} pci_class_T;
|
||||
|
||||
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_NON_VGA_COMPATIBLE_UNCLASSIFIED_DEVICE = 0x00,
|
||||
PCI_SUBCLASS_VGA_COMPATIBLE_UNCLASSIFIED_DEVICE = 0x01
|
||||
} pci_unclassified_sublasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_SCSI_BUS_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_IDE_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_FLOPPY_DISK_CONTROLLER = 0x02,
|
||||
PCI_SUBCLASS_IPI_BUS_CONTROLLER = 0x03,
|
||||
PCI_SUBCLASS_RAID_CONTROLLER = 0x04,
|
||||
PCI_SUBCLASS_ATA_CONTROLLER = 0x05,
|
||||
PCI_SUBCLASS_SERIAL_ATA_CONTROLLER = 0x06,
|
||||
PCI_SUBCLASS_SERIAL_ATTACHED_SCSI_CONTROLLER = 0x07,
|
||||
PCI_SUBCLASS_NON_VOLATILE_MEMORY_CONTROLLER = 0x08,
|
||||
PCI_SUBCLASS_OTHER_MASS_STORAGE_CONTROLLER = 0x80
|
||||
} pci_mass_storage_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_ETHERNET_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_TOKEN_RING_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_FDDI_CONTROLLER = 0x02,
|
||||
PCI_SUBCLASS_ATM_CONTROLLER = 0x03,
|
||||
PCI_SUBCLASS_ISDN_CONTROLLER = 0x04,
|
||||
PCI_SUBCLASS_WORLDFIP_CONTROLLER = 0x05,
|
||||
PCI_SUBCLASS_PICMG_2_14_MULTI_COMPUTING_CONTROLLER = 0x06,
|
||||
PCI_SUBCLASS_INFINIBAND_NETWORKCONTROLLER = 0x07,
|
||||
PCI_SUBCLASS_FABRIC_CONTROLLER = 0x08,
|
||||
PCI_SUBCLASS_OTHER_NETWORK_CONTROLLER = 0x80
|
||||
} pci_network_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_VGA_COMPATIBLE_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_XGA_COMPATIBLE_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_3D_CONTROLLER_NOT_VGA_COMPATIBLE = 0x02,
|
||||
PCI_SUBCLASS_OTHER_DISPLAY_CONTROLLER = 0x80
|
||||
} pci_display_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_MULTIMEDIA_VIDEO_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_MULTIMEDIA_AUDIO_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_COMPUTER_TELEPHONY_DEVICE = 0x02,
|
||||
PCI_SUBCLASS_AUDIO_DEVICE = 0x03,
|
||||
PCI_SUBCLASS_OTHER_MULTIMEDIA_CONTROLLER = 0x80
|
||||
} pci_multimedia_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_RAM_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_FLASH_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_OTHER_MEMORY_CONTROLLER = 0x80
|
||||
} pci_memory_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_HOST_BRIDGE = 0x00,
|
||||
PCI_SUBCLASS_ISA_BRIDGE = 0x01,
|
||||
PCI_SUBCLASS_EISA_BRIDGE = 0x02,
|
||||
PCI_SUBCLASS_MCA_BRIDGE = 0x03,
|
||||
PCI_SUBCLASS_PCI_TO_PCI_BRIDGE = 0x04,
|
||||
PCI_SUBCLASS_PCMCIA_BRIDGE = 0x05,
|
||||
PCI_SUBCLASS_NUBUS_BRIDGE = 0x06,
|
||||
PCI_SUBCLASS_CARDBUS_BRIDGE = 0x07,
|
||||
PCI_SUBCLASS_RACEWAY_BRIDGE = 0x08,
|
||||
PCI_SUBCLASS_PCI_TO_PCI_BRIDGE_2 = 0x09,
|
||||
PCI_SUBCLASS_INFINIBAND_TO_PCI_HOST_BRIDGE = 0x0a,
|
||||
PCI_SUBCLASS_OTHER_BRIDGE = 0x80
|
||||
} pci_bridge_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_SERIAL_SIMPLE_COMMUNICATION_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_PARALLEL_SIMPLE_COMMUNICATION_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_MULTIPORT_SERIAL_CONTROLLER = 0x02,
|
||||
PCI_SUBCLASS_MODEM = 0x03,
|
||||
PCI_SUBCLASS_IEEE_488_1_2_GPIB_CONTROLLER = 0x04,
|
||||
PCI_SUBCLASS_SMART_CARD_CONTROLLER = 0x05,
|
||||
PCI_SUBCLASS_OTHER_SIMPLE_COMMUNICATION_CONTROLLER = 0x80
|
||||
} pci_simple_communication_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_PIC = 0x00,
|
||||
PCI_SUBCLASS_DMA_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_TIMER = 0x02,
|
||||
PCI_SUBCLASS_RTC_CONTROLLER = 0x03,
|
||||
PCI_SUBCLASS_PCI_HOT_PLUG_CONTROLLER = 0x04,
|
||||
PCI_SUBCLASS_SD_HOST_CONTROLLER = 0x05,
|
||||
PCI_SUBCLASS_IOMMU = 0x06,
|
||||
PCI_SUBCLASS_OTHER_BASE_SYSTEM_PERIPHERAL = 0x80
|
||||
} pci_base_system_peripheral_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_KEKYBOARD_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_DIGITIZER_PEN = 0x01,
|
||||
PCI_SUBCLASS_MOUSE_CONTROLLER = 0x02,
|
||||
PCI_SUBCLASS_SCANNER_CONTROLLER = 0x03,
|
||||
PCI_SUBCLASS_GAMEPORT_CONTROLLER = 0x04,
|
||||
PCI_SUBCLASS_OTHER_INPUT_DEVICE_CONTROLLER = 0x80
|
||||
} pci_input_device_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_GENERIC_DOCKING_STATION = 0x00,
|
||||
PCI_SUBCLASS_OTHER_DOCKING_STATION = 0x80
|
||||
} pci_docking_station_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_386_PROCESSOR = 0x00,
|
||||
PCI_SUBCLASS_486_PROCESSOR = 0x01,
|
||||
PCI_SUBCLASS_PENTIUM_PROCESSOR = 0x02,
|
||||
PCI_SUBCLASS_PENTIUM_PRO_PROCESSOR = 0x03,
|
||||
PCI_SUBCLASS_ALPHA_PROCESSOR = 0x10,
|
||||
PCI_SUBCLASS_POWERPC_PROCESSOR = 0x20,
|
||||
PCI_SUBCLASS_MIPS_PROCESSOR = 0x30,
|
||||
PCI_SUBCLASS_COPROCESSOR = 0x40,
|
||||
PCI_SUBCLASS_OTHER_PROCESSOR = 0x80
|
||||
} pci_processor_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_FIREWIRE_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_ACCESS_BUS_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_SSA = 0x02,
|
||||
PCI_SUBCLASS_USB_CONTROLLER = 0x03,
|
||||
PCI_SUBCLASS_FIBRE_CHANNEL = 0x04,
|
||||
PCI_SUBCLASS_SMBUS_CONTROLLER = 0x05,
|
||||
PCI_SUBCLASS_INFINIBAND_SERIAL_BUS_CONTROLLER = 0x06,
|
||||
PCI_SUBCLASS_IPMI_INTERFACE = 0x07,
|
||||
PCI_SUBCLASS_SERCOS_INTERFACE = 0x08,
|
||||
PCI_SUBCLASS_CANBUS_CONTROOLLER = 0x09,
|
||||
PCI_SUBCLASS_OTHER_SERIAL_BUS_CONTROLLER = 0x80
|
||||
} pci_serial_bus_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_IRDA_COMPATIBLE_CONTROLLER = 0x00,
|
||||
PCI_SUBCLASS_CONSUMER_IR_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_RF_CONTROLLER = 0x10,
|
||||
PCI_SUBCLASS_BLUETOOTH_CONTROLLER = 0x11,
|
||||
PCI_SUBCLASS_BROADBAND_CONTROLLER = 0x12,
|
||||
PCI_SUBCLASS_ETHERNET_CONTROLLER_802_1A = 0x20,
|
||||
PCI_SUBCLASS_ETHERNET_CONTROLLER_802_1B = 0x21,
|
||||
PCI_SUBCLASS_OTHER_WIRELESS_CONTROLLER = 0x80
|
||||
} pci_wireless_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_I20_INTELLIGENT_CONTROLLER = 0x00
|
||||
} pci_intelligent_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_SATELLITE_TV_CONTROLLER = 0x01,
|
||||
PCI_SUBCLASS_SATELLITE_AUDIO_CONTROLLER = 0x02,
|
||||
PCI_SUBCLASS_SATELLITE_VOICE_CONTROLLER = 0x03,
|
||||
PCI_SUBCLASS_SATELLITE_DATA_CONTROLLER = 0x04
|
||||
} pci_satellite_communication_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_NETWORK_AND_COMPUTING_ENCRYPTION_DECRYPTION = 0x00,
|
||||
PCI_SUBCLASS_ENTERTAINMENT_ENCRYPTION_DECRYPTION = 0x10,
|
||||
PCI_SUBCLASS_OTHER_ENCRYPTION_CONTROLLER = 0x80
|
||||
} pci_encryption_controller_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
PCI_SUBCLASS_DPIO_MODULES = 0x00,
|
||||
PCI_SUBCLASS_PERFORMANCE_COUTNERS = 0x01,
|
||||
PCI_SUBCLASS_COMMUNICATION_SYNCHRONIZER = 0x10,
|
||||
PCI_SUBCLASS_SIGNAL_PROCESSING_MANAGEMENT = 0x20,
|
||||
PCI_SUBCLASS_OTHER_SIGNAL_PROCESSING_CONTROLLER = 0x80
|
||||
} pci_signal_processing_controller_subclasses_T;
|
||||
/*
|
||||
typedef enum {
|
||||
|
||||
} pci_processing_accelerator_subclasses_T;
|
||||
|
||||
typedef enum {
|
||||
|
||||
} pci_non_essential_instrumentation_subclasses_T;
|
||||
*/
|
||||
|
||||
|
||||
typedef struct {
|
||||
|
||||
} pci_device_T;
|
||||
|
||||
|
||||
|
||||
void pci_init(acpi_sdt_header_T *xsdt);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
// sends one byte to a port
|
||||
void io_out_byte (uint16_t port, uint8_t data);
|
||||
uint8_t io_in_byte (uint16_t port);
|
||||
void io_out_word (uint16_t port, uint32_t data);
|
||||
uint32_t io_in_word (uint16_t port);
|
||||
void io_wait ();
|
||||
|
||||
#endif //NOX_IO_H
|
||||
|
|
|
|||
9
run.sh
9
run.sh
|
|
@ -1,11 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
# This file is part of noxos and licensed under the MIT open source license
|
||||
|
||||
EMUFLAGS="-no-reboot -m 256M -cdrom build/noxos.iso -chardev stdio,id=log,logfile=noxos.log -serial chardev:log -drive id=disk,file=test_disk.img,if=none \
|
||||
-device ahci,id=disk \
|
||||
-device ide-hd,drive=disk
|
||||
|
||||
"
|
||||
EMUFLAGS="-no-reboot -m 256M -cdrom build/noxos.iso -chardev stdio,id=log,logfile=noxos.log -serial chardev:log"
|
||||
|
||||
emulate_bios() {
|
||||
echo "<=====| Emulating |=====>"
|
||||
|
|
@ -33,4 +30,4 @@ case $1 in
|
|||
*)
|
||||
emulate_uefi
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
|
@ -41,7 +41,7 @@ void acpi_init(boot_info_T* boot_info) {
|
|||
}
|
||||
}
|
||||
|
||||
g_mcfg_table = acpi_find_table((acpi_sdt_header_T*)((rsdp_descriptor_v2_T*)boot_info->rsdp)->xsdt_address, "MCFG");
|
||||
g_mcfg_table = acpi_find_table(rsdp, "MCFG");
|
||||
}
|
||||
|
||||
acpi_sdt_header_T* acpi_find_table(acpi_sdt_header_T* xsdt, string_t table_id) {
|
||||
|
|
@ -54,6 +54,7 @@ acpi_sdt_header_T* acpi_find_table(acpi_sdt_header_T* xsdt, string_t table_id) {
|
|||
if (!memory_compare(sdt->signature, (void*)table_id, 4)) continue;
|
||||
return sdt;
|
||||
}
|
||||
|
||||
log(LOG_WARNING, "<ACPI> table '%.4' not found (no matching xsdt entry)");
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,3 +1,46 @@
|
|||
#include <drivers/pci.h>
|
||||
|
||||
typedef struct {
|
||||
uint64_t config_base_address;
|
||||
uint16_t segment_group_number;
|
||||
uint8_t min_pci_bus_number;
|
||||
uint8_t max_pci_bus_number;
|
||||
uint32_t reserved;
|
||||
} __attribute__((packed)) pci_mcfg_table_entry_T;
|
||||
|
||||
typedef struct{
|
||||
uint16_t device_index;
|
||||
uint16_t vendor_id;
|
||||
uint16_t status;
|
||||
uint16_t command;
|
||||
uint8_t class_code;
|
||||
uint8_t subclass;
|
||||
uint8_t prog_info_struct;
|
||||
uint8_t revision_id;
|
||||
uint8_t bist;
|
||||
uint8_t header_type;
|
||||
uint8_t latency_timer;
|
||||
uint8_t cache_line_size;
|
||||
} __attribute__((packed)) pci_config_space;
|
||||
|
||||
pci_device_T *g_pci_devices;
|
||||
|
||||
pci_device_T pci_decode_device(void *config_space) {
|
||||
|
||||
}
|
||||
|
||||
void pci_init(acpi_sdt_header_T *xsdt) {
|
||||
|
||||
uint32_t num_devices = (g_mcfg_table->length - 44); // Table data length in bytes
|
||||
if(num_devices == 0) return;
|
||||
num_devices /= 16; // Each entry is 16 bytes long; get the number of entries from the number of bytes.
|
||||
|
||||
pci_mcfg_table_entry_T *entries = g_mcfg_table + 44;
|
||||
g_pci_devices = memory_allocate(sizeof(pci_mcfg_table_entry_T) * num_devices);
|
||||
|
||||
uint32_t device_index = 0;
|
||||
while(device_index < num_devices) {
|
||||
pci_decode_device(&entries[device_index]);
|
||||
++device_index;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,16 +12,6 @@ uint8_t io_in_byte(uint16_t port) {
|
|||
return data;
|
||||
}
|
||||
|
||||
void io_out_word(uint16_t port, uint32_t data) {
|
||||
asm volatile ("outl %0, %1" : : "a"(data), "Nd"(port));
|
||||
}
|
||||
|
||||
uint32_t io_in_word(uint16_t port) {
|
||||
uint32_t data;
|
||||
asm volatile ("inl %1, %0" : "=a"(data) : "Nd"(port));
|
||||
return data;
|
||||
}
|
||||
|
||||
void io_wait() {
|
||||
io_out_byte(0x80, 0);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue