From 064b9be4576a48debd02fac0f8aa4d978e6f2326 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 9 Jul 1998 23:30:32 +0000 Subject: [PATCH] Switched to shared default probe routine. --- c/src/lib/libchip/serial/ns16550.c | 17 +++-------------- c/src/libchip/serial/ns16550.c | 17 +++-------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/c/src/lib/libchip/serial/ns16550.c b/c/src/lib/libchip/serial/ns16550.c index 6ccc1a1386..1867ae3929 100644 --- a/c/src/lib/libchip/serial/ns16550.c +++ b/c/src/lib/libchip/serial/ns16550.c @@ -27,6 +27,7 @@ #include #include "ns16550_p.h" +#include "sersupp.h" /* * Flow control is only supported when using interrupts @@ -45,7 +46,7 @@ console_flow ns16550_flow_DTRCTS = console_fns ns16550_fns = { - ns16550_probe, /* deviceProbe */ + libchip_serial_default_probe, /* deviceProbe */ ns16550_open, /* deviceFirstOpen */ ns16550_flush, /* deviceLastClose */ NULL, /* deviceRead */ @@ -58,7 +59,7 @@ console_fns ns16550_fns = console_fns ns16550_fns_polled = { - ns16550_probe, /* deviceProbe */ + libchip_serial_default_probe, /* deviceProbe */ ns16550_open, /* deviceFirstOpen */ ns16550_close, /* deviceLastClose */ ns16550_inbyte_nonblocking_polled, /* deviceRead */ @@ -71,18 +72,6 @@ console_fns ns16550_fns_polled = extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -/* - * Console Device Driver Entry Points - */ -NS16550_STATIC boolean ns16550_probe(int minor) -{ - /* - * If the configuration dependent probe has located the device then - * assume it is there - */ - return(TRUE); -} - NS16550_STATIC void ns16550_init(int minor) { unsigned32 pNS16550; diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index 6ccc1a1386..1867ae3929 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -27,6 +27,7 @@ #include #include "ns16550_p.h" +#include "sersupp.h" /* * Flow control is only supported when using interrupts @@ -45,7 +46,7 @@ console_flow ns16550_flow_DTRCTS = console_fns ns16550_fns = { - ns16550_probe, /* deviceProbe */ + libchip_serial_default_probe, /* deviceProbe */ ns16550_open, /* deviceFirstOpen */ ns16550_flush, /* deviceLastClose */ NULL, /* deviceRead */ @@ -58,7 +59,7 @@ console_fns ns16550_fns = console_fns ns16550_fns_polled = { - ns16550_probe, /* deviceProbe */ + libchip_serial_default_probe, /* deviceProbe */ ns16550_open, /* deviceFirstOpen */ ns16550_close, /* deviceLastClose */ ns16550_inbyte_nonblocking_polled, /* deviceRead */ @@ -71,18 +72,6 @@ console_fns ns16550_fns_polled = extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -/* - * Console Device Driver Entry Points - */ -NS16550_STATIC boolean ns16550_probe(int minor) -{ - /* - * If the configuration dependent probe has located the device then - * assume it is there - */ - return(TRUE); -} - NS16550_STATIC void ns16550_init(int minor) { unsigned32 pNS16550;