- cleanup, remove fake device descriptions,
- add generic device descriptions for the various incarnations of the PC UART, - just use pc_serial as devfs basename regardless. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33858 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -24,6 +24,7 @@ pci_module_info *gPCIModule = NULL;
|
|||||||
tty_module_info *gTTYModule = NULL;
|
tty_module_info *gTTYModule = NULL;
|
||||||
struct ddomain gSerialDomain;
|
struct ddomain gSerialDomain;
|
||||||
sem_id gDriverLock = -1;
|
sem_id gDriverLock = -1;
|
||||||
|
bool gHandleISA = false;
|
||||||
|
|
||||||
// 24 MHz clock
|
// 24 MHz clock
|
||||||
static const uint32 sDefaultRates[] = {
|
static const uint32 sDefaultRates[] = {
|
||||||
@@ -89,26 +90,22 @@ static const struct serial_support_descriptor sSupportedDevices[] = {
|
|||||||
{ PCI_simple_communications, PCI_serial, PCI_serial_16550,
|
{ PCI_simple_communications, PCI_serial, PCI_serial_16550,
|
||||||
PCI_INVAL, PCI_INVAL } },
|
PCI_INVAL, PCI_INVAL } },
|
||||||
|
|
||||||
//XXX
|
{ B_PCI_BUS, "Generic 16650 Serial Port", sDefaultRates, NULL, { 8, 8, 8 },
|
||||||
|
{ PCI_simple_communications, PCI_serial, PCI_serial_16650,
|
||||||
|
PCI_INVAL, PCI_INVAL } },
|
||||||
|
|
||||||
|
{ B_PCI_BUS, "Generic 16750 Serial Port", sDefaultRates, NULL, { 8, 8, 8 },
|
||||||
|
{ PCI_simple_communications, PCI_serial, PCI_serial_16750,
|
||||||
|
PCI_INVAL, PCI_INVAL } },
|
||||||
|
|
||||||
|
{ B_PCI_BUS, "Generic 16850 Serial Port", sDefaultRates, NULL, { 8, 8, 8 },
|
||||||
|
{ PCI_simple_communications, PCI_serial, PCI_serial_16850,
|
||||||
|
PCI_INVAL, PCI_INVAL } },
|
||||||
|
|
||||||
{ B_PCI_BUS, "Generic 16950 Serial Port", sDefaultRates, NULL, { 8, 8, 8 },
|
{ B_PCI_BUS, "Generic 16950 Serial Port", sDefaultRates, NULL, { 8, 8, 8 },
|
||||||
{ PCI_simple_communications, PCI_serial, PCI_serial_16950,
|
{ PCI_simple_communications, PCI_serial, PCI_serial_16950,
|
||||||
PCI_INVAL, PCI_INVAL } },
|
PCI_INVAL, PCI_INVAL } },
|
||||||
|
|
||||||
//XXX DEBUG! HACK HACK HACK
|
|
||||||
//XXX for testing probing
|
|
||||||
#if 0
|
|
||||||
{ B_PCI_BUS, "My BadIDE controller", sDefaultRates, NULL, { 8, 32, 8 },
|
|
||||||
{ 1, 1, 0x8a,
|
|
||||||
0x1002, 0x434a } },
|
|
||||||
{ B_PCI_BUS, "My GoodIDE controller", sDefaultRates, NULL, { 8, 32, 8 },
|
|
||||||
{ 1, 1, 0x8a,
|
|
||||||
0x1002, 0x4349 } },
|
|
||||||
{ B_PCI_BUS, "My IDE controller", sDefaultRates, NULL, { 8, 32, 8 },
|
|
||||||
{ 1, 1, 0x8a,
|
|
||||||
PCI_INVAL, PCI_INVAL } },
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// non PCI_serial devices
|
// non PCI_serial devices
|
||||||
|
|
||||||
// beos zz driver supported that one
|
// beos zz driver supported that one
|
||||||
|
|||||||
@@ -35,12 +35,9 @@ extern "C" {
|
|||||||
#define DRIVER_NAME "pc_serial" // driver name for debug output
|
#define DRIVER_NAME "pc_serial" // driver name for debug output
|
||||||
#define DEVICES_COUNT 20 // max simultaneously open devices
|
#define DEVICES_COUNT 20 // max simultaneously open devices
|
||||||
|
|
||||||
#ifdef HANDLE_ISA_COM
|
|
||||||
#define DEVFS_BASE "ports/my_serial"
|
|
||||||
#else
|
|
||||||
// avoid clashing with BeOS zz driver
|
// avoid clashing with BeOS zz driver
|
||||||
#define DEVFS_BASE "ports/pc_serial"
|
#define DEVFS_BASE "ports/pc_serial"
|
||||||
#endif
|
//#define DEVFS_BASE "ports/serial"
|
||||||
|
|
||||||
|
|
||||||
// no user serviceable part beyond this point
|
// no user serviceable part beyond this point
|
||||||
|
|||||||
Reference in New Issue
Block a user