From cd571ddfb497bcadf2ed9bb6ca210f5a2d73e22a Mon Sep 17 00:00:00 2001 From: Aren Elchinyan Date: Wed, 29 Nov 2023 00:11:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BE=D1=87=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/version.h | 2 +- modules/pci/main.c | 4 ++-- modules/pci_data/main.c | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/version.h b/include/version.h index d2411fa..1fd17b3 100644 --- a/include/version.h +++ b/include/version.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 1 -#define VERSION_BUILD 740 +#define VERSION_BUILD 742 diff --git a/modules/pci/main.c b/modules/pci/main.c index 44975b9..c13bcc8 100644 --- a/modules/pci/main.c +++ b/modules/pci/main.c @@ -100,7 +100,7 @@ static inline void scan( ) { uint16_t class_id = get_class_id(bus, slot, function); 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", devices, vendor, name, device_id, class_id, bus, slot, function); @@ -119,7 +119,7 @@ module_info_t __attribute__((section(".minit"))) init(env_t *env) { num_vendors = pci_data->data_size - 1; if (pci_data == NULL) { - fb_printf("Модуль PCI данных не найден!\n"); + fb_printf("Адаптер PCI данных не найден!\n"); num_vendors = 0; } else { fb_printf("Записей в базе PCI: %u\n", pci_data->data_size); diff --git a/modules/pci_data/main.c b/modules/pci_data/main.c index 9ff4bff..5b4deae 100644 --- a/modules/pci_data/main.c +++ b/modules/pci_data/main.c @@ -67,17 +67,13 @@ module_info_t __attribute__((section(".minit"))) init(env_t *env) { 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, ';'); fb_printf("Количество вендоров: %u\n", num_vendors); vendor_t **vendor_list = 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); return (module_info_t){ .name = (char *)"[PCI][ADAPTER]",