Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commented raw type handling, as it doesn't work for now 

added a user friendly mode for listdev: it works for PCI


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19262 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2006-11-12 17:22:29 +00:00
parent ddacfc7ff0
commit 01b06fcc52
2 changed files with 229 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
src/bin/listdev/listdev.c
View File

@ -1,14 +1,114 @@
/*
* Copyright 2006, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Jérôme Duval
*/
#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <drivers/device_manager.h>
#include <drivers/module.h>
#include <drivers/PCI.h>
#include <drivers/bus/PCI.h>
#include "dm_wrapper.h"
extern const char *__progname;
#define DUMP_MODE 0
#define USER_MODE 1
int gMode = USER_MODE;
#define BUS_ISA 1
#define BUS_PCI 2
const char *base_desc[] = {
"Legacy",
"Mass Storage Controller",
"NIC",
"Display Controller",
"Multimedia Device",
"Memory Controller",
"Bridge Device",
"Communication Device",
"Generic System Peripheral",
"Input Device",
"Docking Station",
"CPU",
"Serial Bus Controller"
};
struct subtype_descriptions {
uchar base, subtype;
char *name;
} subtype_desc[] = {
{ 0, 0, "non-VGA" },
{ 0, 0, "VGA" },
{ 1, 0, "SCSI" },
{ 1, 1, "IDE" },
{ 1, 2, "Floppy" },
{ 1, 3, "IPI" },
{ 1, 4, "RAID" },
{ 2, 0, "Ethernet" },
{ 2, 1, "Token Ring" },
{ 2, 2, "FDDI" },
{ 2, 3, "ATM" },
{ 3, 0, "VGA/8514" },
{ 3, 1, "XGA" },
{ 4, 0, "Video" },
{ 4, 1, "Audio" },
{ 5, 0, "RAM" },
{ 5, 1, "Flash" },
{ 6, 0, "Host" },
{ 6, 1, "ISA" },
{ 6, 2, "EISA" },
{ 6, 3, "MCA" },
{ 6, 4, "PCI-PCI" },
{ 6, 5, "PCMCIA" },
{ 6, 6, "NuBus" },
{ 6, 7, "CardBus" },
{ 7, 0, "Serial" },
{ 7, 1, "Parallel" },
{ 8, 0, "PIC" },
{ 8, 1, "DMA" },
{ 8, 2, "Timer" },
{ 8, 3, "RTC" },
{ 9, 0, "Keyboard" },
{ 9, 1, "Digitizer" },
{ 9, 2, "Mouse" },
{10, 0, "Generic" },
{11, 0, "386" },
{11, 1, "486" },
{11, 2, "Pentium" },
{11,16, "Alpha" },
{11,32, "PowerPC" },
{11,48, "Coprocessor" },
{12, 0, "IEEE 1394" },
{12, 1, "ACCESS" },
{12, 2, "SSA" },
{12, 3, "USB" },
{12, 4, "Fibre Channel" },
{255,255, NULL }
};
static void
usage()
{
fprintf(stderr, "usage: %s [-d]\n", __progname);
fprintf(stderr, "Displays devices in a user friendly way\n");
fprintf(stderr, "-d : dumps the tree\n");
exit(0);
}
static void
put_level(int32 level)
{
@ -47,6 +147,7 @@ dump_attribute(struct dev_attr *attr, int32 level)
printf("\n");
}
static void
dump_device(uint32 *node, uint8 level)
{
@ -69,6 +170,8 @@ dump_nodes(uint32 *node, uint8 level)
status_t err;
uint32 child = *node;
dump_device(node, level);
printf("node %lu\n", *node);
if (get_child(&child) != B_OK)
return;
@ -79,7 +182,111 @@ dump_nodes(uint32 *node, uint8 level)
}
int main()
static void
display_device(uint32 *node, uint8 level, int parent_bus, int *bus)
{
char data[256];
struct dev_attr attr;
uint8 is_bus = 0;
char connection[255] = "";
uint8 pci_class_base_id = 0;
uint8 pci_class_sub_id = 0;
uint8 pci_class_api_id = 0;
uint16 pci_vendor_id = 0;
uint16 pci_device_id = 0;
attr.cookie = 0;
attr.node_cookie = *node;
attr.value.raw.data = data;
attr.value.raw.length = sizeof(data);
while (dm_get_next_attr(&attr) == B_OK) {
if (!strcmp(attr.name, "bus/is_bus")
&& attr.type == B_UINT8_TYPE) {
is_bus = attr.value.ui8;
} else if (!strcmp(attr.name, "connection")
&& attr.type == B_STRING_TYPE) {
strlcpy(connection, attr.value.string, 255);
}
switch (parent_bus) {
case BUS_ISA:
break;
case BUS_PCI:
if (!strcmp(attr.name, "pci/class/base_id")
&& attr.type == B_UINT8_TYPE)
pci_class_base_id = attr.value.ui8;
else if (!strcmp(attr.name, "pci/class/sub_id")
&& attr.type == B_UINT8_TYPE)
pci_class_sub_id = attr.value.ui8;
else if (!strcmp(attr.name, "pci/class/api_id")
&& attr.type == B_UINT8_TYPE)
pci_class_api_id = attr.value.ui8;
else if (!strcmp(attr.name, PCI_DEVICE_VENDOR_ID_ITEM)
&& attr.type == B_UINT16_TYPE)
pci_vendor_id = attr.value.ui16;
else if (!strcmp(attr.name, PCI_DEVICE_DEVICE_ID_ITEM)
&& attr.type == B_UINT16_TYPE)
pci_device_id = attr.value.ui16;
break;
};
}
if (is_bus) {
if (!strcmp(connection, "ISA"))
*bus = BUS_ISA;
else if (!strcmp(connection, "PCI"))
*bus = BUS_PCI;
}
switch (parent_bus) {
case BUS_ISA:
break;
case BUS_PCI:
printf("device ");
printf((pci_class_base_id < 13) ? base_desc[pci_class_base_id] : "Unknown");
if (pci_class_sub_id == 0x80)
printf(" (Other)");
else {
struct subtype_descriptions *s = subtype_desc;
while (s->name) {
if ((pci_class_base_id == s->base) && (pci_class_sub_id == s->subtype))
break;
s++;
}
printf(" (%s)", (s->name) ? s->name : "Unknown");
}
printf(" [%x|%x|%x]\n", pci_class_base_id, pci_class_sub_id, pci_class_api_id);
printf("vendor id: %x, device id: %x\n", pci_vendor_id, pci_device_id);
break;
}
}
static void
display_nodes(uint32 *node, uint8 level, int parent_bus)
{
status_t err;
uint32 child = *node;
int bus = 0;
display_device(node, level, parent_bus, &bus);
if (get_child(&child) != B_OK)
return;
do {
display_nodes(&child, level+1, bus);
} while ((err = get_next_child(&child)) == B_OK);
}
int
main(int argc, char **argv)
{
status_t error;
uint32 root;
@ -88,9 +295,25 @@ int main()
printf("Error initializing device manager (%s)\n", strerror(error));
return error;
}
if (argc > 2)
usage();
get_root(&root);
dump_nodes(&root, 0);
if (argc == 2) {
if (!strcmp(argv[1], "-d")) {
gMode = DUMP_MODE;
} else {
usage();
}
}
if (gMode == DUMP_MODE) {
get_root(&root);
dump_nodes(&root, 0);
} else {
get_root(&root);
display_nodes(&root, 0, 0);
}
uninit_dm_wrapper();

8
src/system/kernel/device_manager/nodes.c
View File

@ -610,8 +610,6 @@ device_manager_control(const char *subsystem, uint32 function, void *buffer, siz
cookie = child->internal_id;
benaphore_unlock(&gNodeLock);
cookie++;
if (!child)
return B_ENTRY_NOT_FOUND;
// copy back to user space
@ -661,12 +659,12 @@ device_manager_control(const char *subsystem, uint32 function, void *buffer, siz
attr.value.ui64 = attr_info->attr.value.ui64; break;
case B_STRING_TYPE:
strlcpy(attr.value.string, attr_info->attr.value.string, 254); break;
case B_RAW_TYPE:
/*case B_RAW_TYPE:
if (attr.value.raw.length > attr_info->attr.value.raw.length)
attr.value.raw.length = attr_info->attr.value.raw.length;
memcpy(attr.value.raw.data, attr_info->attr.value.raw.data,
user_memcpy(attr.value.raw.data, attr_info->attr.value.raw.data,
attr.value.raw.length);
break;
break;*/
}
benaphore_unlock(&gNodeLock);