Aren
/
BMOSP
mirror of https://github.com/0Nera/BMOSP.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Изменение отладочного вывода

This commit is contained in:
Aren Elchinyan 2023-11-29 00:11:15 +03:00
parent 27fe3e827a
commit cd571ddfb4
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/version.h
View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 1 #define VERSION_MINOR 1
#define VERSION_BUILD 740 #define VERSION_BUILD 742

4
modules/pci/main.c
View File

@ -100,7 +100,7 @@ static inline void scan( ) {
uint16_t class_id = get_class_id(bus, slot, function); uint16_t class_id = get_class_id(bus, slot, function);
char *name = find_vendor(vendor); char *name = find_vendor(vendor);
fb_printf("[%u] vendor: %x [%s], device: 0x%x, class: %u, " fb_printf("[%u] %x [%s], устройство: %x, класс: %u, "
"%u.%u.%u\n", "%u.%u.%u\n",
devices, vendor, name, device_id, class_id, bus, slot, devices, vendor, name, device_id, class_id, bus, slot,
function); function);
@ -119,7 +119,7 @@ module_info_t __attribute__((section(".minit"))) init(env_t *env) {
num_vendors = pci_data->data_size - 1; num_vendors = pci_data->data_size - 1;
if (pci_data == NULL) { if (pci_data == NULL) {
fb_printf("Модуль PCI данных не найден!\n"); fb_printf("Адаптер PCI данных не найден!\n");
num_vendors = 0; num_vendors = 0;
} else { } else {
fb_printf("Записей в базе PCI: %u\n", pci_data->data_size); fb_printf("Записей в базе PCI: %u\n", pci_data->data_size);

6
modules/pci_data/main.c
View File

@ -67,17 +67,13 @@ module_info_t __attribute__((section(".minit"))) init(env_t *env) {
module_info_t *pci_data = get_module("[PCI][DATA][VENDORS]"); module_info_t *pci_data = get_module("[PCI][DATA][VENDORS]");
if (pci_data == NULL) { fb_printf("Модуль PCI данных не найден!\n"); } if (pci_data == NULL) { fb_printf("База PCI не найдена!\n"); }
uint64_t num_vendors = count_chars(pci_data->data, ';'); uint64_t num_vendors = count_chars(pci_data->data, ';');
fb_printf("Количество вендоров: %u\n", num_vendors); fb_printf("Количество вендоров: %u\n", num_vendors);
vendor_t **vendor_list = vendor_t **vendor_list =
parse_file(pci_data->data, num_vendors, pci_data->data_size); parse_file(pci_data->data, num_vendors, pci_data->data_size);
fb_printf("База PCI: 0x%x\n", vendor_list);
fb_printf("База PCI: 0x%x\n", &vendor_list);
fb_printf("База PCI: 0x%x\n", vendor_list[0]);
fb_printf("База PCI: 0x%x\n", vendor_list + offset);
// print_vendors(num_vendors, vendor_list); // print_vendors(num_vendors, vendor_list);
return (module_info_t){ return (module_info_t){
.name = (char *)"[PCI][ADAPTER]", .name = (char *)"[PCI][ADAPTER]",