rpms/lshw
7
0
Fork 0
Code Issues Pull Requests Releases Activity
0e139b99ad
lshw/0005-begin-work-on-input-devices.patch

224 lines
6.0 KiB
Diff
Raw Blame History

From 691ed58e2838ca3e50e899f013e259ea84f6bfe9 Mon Sep 17 00:00:00 2001
From: Lyonel Vincent <lyonel@ezix.org>
Date: Wed, 1 Apr 2020 00:43:15 +0200
Subject: [PATCH 05/17] begin work on input devices
still missing:
* capabilities
* properties
* report at least as much information as /proc/bus/input/devices
---
src/core/hw.cc | 2 +-
src/core/input.cc | 146 ++++++++++++++++++++++++++++++++++++++++++++++
src/core/input.h | 8 +++
src/core/main.cc | 4 ++
4 files changed, 159 insertions(+), 1 deletions(-)
create mode 100644 src/core/input.cc
create mode 100644 src/core/input.h
diff --git a/src/core/hw.cc b/src/core/hw.cc
index a59273008862..f7da370816c5 100644
--- a/src/core/hw.cc
+++ b/src/core/hw.cc
@@ -1083,7 +1083,7 @@ void hwNode::setLogicalName(const string & name)
This->logicalnames.push_back("/dev/" + n);
}
else
- This->logicalnames.push_back(n);
+ This->logicalnames.push_back(basename(n.c_str()));
if(This->dev == "")
This->dev = get_devid(n);
diff --git a/src/core/input.cc b/src/core/input.cc
new file mode 100644
index 000000000000..1f14fa9d8b56
--- /dev/null
+++ b/src/core/input.cc
@@ -0,0 +1,146 @@
+#include "version.h"
+#include "hw.h"
+#include "sysfs.h"
+#include "osutils.h"
+#include "input.h"
+#include "disk.h"
+#include "heuristics.h"
+
+#include <vector>
+#include <iostream>
+
+__ID("@(#) $Id$");
+
+#define BUS_PCI 0x01
+#define BUS_ISAPNP 0x02
+#define BUS_USB 0x03
+#define BUS_HIL 0x04
+#define BUS_BLUETOOTH 0x05
+#define BUS_VIRTUAL 0x06
+
+#define BUS_ISA 0x10
+#define BUS_I8042 0x11
+#define BUS_XTKBD 0x12
+#define BUS_RS232 0x13
+#define BUS_GAMEPORT 0x14
+#define BUS_PARPORT 0x15
+#define BUS_AMIGA 0x16
+#define BUS_ADB 0x17
+#define BUS_I2C 0x18
+#define BUS_HOST 0x19
+#define BUS_GSC 0x1A
+#define BUS_ATARI 0x1B
+#define BUS_SPI 0x1C
+#define BUS_RMI 0x1D
+#define BUS_CEC 0x1E
+#define BUS_INTEL_ISHTP 0x1F
+
+using namespace std;
+
+bool scan_input(hwNode & n)
+{
+ vector < sysfs::entry > entries = sysfs::entries_by_class("input");
+
+ if (entries.empty())
+ return false;
+
+ for (vector < sysfs::entry >::iterator it = entries.begin();
+ it != entries.end(); ++it)
+ {
+ const sysfs::entry & e = *it;
+
+ if(!e.hassubdir("id")) continue;
+
+ hwNode *device = n.findChildByBusInfo(e.leaf().businfo());
+ if(!device)
+ device = n.addChild(hwNode("input", hw::input));
+ else
+ {
+ if(device->getClass() == hw::generic)
+ device->setClass(hw::input);
+ }
+ device->claim();
+ device->setLogicalName("input/"+e.name());
+ device->setProduct(e.string_attr("name"));
+ device->setModalias(e.modalias());
+ switch(e.hex_attr("id/bustype"))
+ {
+ case BUS_PCI:
+ device->addCapability("pci", "PCI");
+ break;
+ case BUS_ISAPNP:
+ device->addCapability("isa", "ISA");
+ device->addCapability("pnp", "PnP");
+ break;
+ case BUS_USB:
+ device->addCapability("usb", "USB");
+ break;
+ case BUS_HIL:
+ device->addCapability("hil", "HP-HIL");
+ break;
+ case BUS_BLUETOOTH:
+ device->addCapability("bt", "Bluetooth");
+ break;
+ case BUS_VIRTUAL:
+ device->addCapability("virtual");
+ break;
+ case BUS_ISA:
+ device->addCapability("isa", "ISA bus");
+ break;
+ case BUS_I8042:
+ device->addCapability("i8042", "i8042 PC AT keyboard controller");
+ break;
+ case BUS_XTKBD:
+ device->addCapability("xtkbd", "XT keyboard controller");
+ break;
+ case BUS_RS232:
+ device->addCapability("rs232", "RS-232 serial");
+ break;
+ case BUS_GAMEPORT:
+ device->addCapability("gameport", "game port");
+ break;
+ case BUS_PARPORT:
+ device->addCapability("parport", "parallel port");
+ break;
+ case BUS_AMIGA:
+ device->addCapability("amiga", "Amiga bus");
+ break;
+ case BUS_ADB:
+ device->addCapability("adb", "Apple Desktop Bus");
+ break;
+ case BUS_I2C:
+ device->addCapability("i2c", "I²C bus");
+ break;
+ case BUS_HOST:
+ device->addCapability("host");
+ break;
+ case BUS_GSC:
+ device->addCapability("gsc", "GSC bus");
+ break;
+ case BUS_ATARI:
+ device->addCapability("atari", "Atari bus");
+ break;
+ case BUS_SPI:
+ device->addCapability("spi", "SPI");
+ break;
+ case BUS_RMI:
+ device->addCapability("rmi", "RMI");
+ break;
+ case BUS_CEC:
+ device->addCapability("cec", "CEC");
+ break;
+ case BUS_INTEL_ISHTP:
+ device->addCapability("intelishtp", "Intel Integrated Sensor Hub");
+ break;
+ }
+
+ vector < sysfs::entry > events = e.devices();
+ for(vector < sysfs::entry >::iterator i = events.begin(); i != events.end(); ++i)
+ {
+ const sysfs::entry & d = *i;
+ device->setLogicalName("input/"+d.name());
+ }
+ }
+
+ return true;
+}
diff --git a/src/core/input.h b/src/core/input.h
new file mode 100644
index 000000000000..1bf2383bc53b
--- /dev/null
+++ b/src/core/input.h
@@ -0,0 +1,8 @@
+#ifndef _INPUT_H_
+#define _INPUT_H_
+
+#include "hw.h"
+
+bool scan_input(hwNode &);
+
+#endif
diff --git a/src/core/main.cc b/src/core/main.cc
index d0d7f1057c29..ad0e586ef549 100644
--- a/src/core/main.cc
+++ b/src/core/main.cc
@@ -45,6 +45,7 @@
#include "vio.h"
#include "nvme.h"
#include "mmc.h"
+#include "input.h"
#include "smp.h"
#include "abi.h"
#include "s390.h"
@@ -140,6 +141,9 @@ bool scan_system(hwNode & system)
status("MMC");
if (enabled("mmc"))
scan_mmc(computer);
+ status("input");
+ if (enabled("input"))
+ scan_input(computer);
status("S/390 devices");
if (enabled("s390"))
scan_s390_devices(computer);
--
2.17.1
Reference in New Issue View Git Blame Copy Permalink