diff options
| author | Stew Benedict <stewb@mandriva.org> | 2001-07-18 15:54:47 +0000 |
|---|---|---|
| committer | Stew Benedict <stewb@mandriva.org> | 2001-07-18 15:54:47 +0000 |
| commit | 4239729f41a697b744609b24993e756ec48a1303 (patch) | |
| tree | f580e59394e46ecb529d65cec9c35911bf244292 /tools | |
| parent | 51b0ae8285a511e53be6f27fbaff0825d8a1c8c2 (diff) | |
| download | drakx-4239729f41a697b744609b24993e756ec48a1303.tar drakx-4239729f41a697b744609b24993e756ec48a1303.tar.gz drakx-4239729f41a697b744609b24993e756ec48a1303.tar.bz2 drakx-4239729f41a697b744609b24993e756ec48a1303.tar.xz drakx-4239729f41a697b744609b24993e756ec48a1303.zip | |
roll back some changes from PPC beta - OldWorld vs NewWorld bootloader
modem detection on ttyS0, new sound module in 2.4.4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/serial_probe/serial.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/serial_probe/serial.c b/tools/serial_probe/serial.c index ef575d6c3..14b315817 100644 --- a/tools/serial_probe/serial.c +++ b/tools/serial_probe/serial.c @@ -997,6 +997,11 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags, maj = major(sb.st_rdev); if (maj != 4 && (maj < 136 || maj > 143)) { if (ioctl (fd, TIOCLINUX, &twelve) < 0) { + #ifdef __powerpc__ + // we could have gotten an error for another reason - like EINVAL + // skipping ttyS0 on PPC - which is where most modems reside + if (errno == ENOTTY) { + #endif if (ioctl (fd, TIOCGSERIAL, &si) >= 0) { if (si.line > 0) { console = 1 << si.line; @@ -1004,6 +1009,9 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags, console = 0; } } else console = 0; + #ifdef __powerpc__ + } + #endif } } close(fd); |