Fix broken low level ppb_rxxx() return type: char becomes u_char.

Submitted by: Bruce Evans <bde@zeta.org.au>

Some ppb bootup printfs simplified.

8 files changed, 63 insertions, 65 deletions

diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 779db99..8552554 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.c,v 1.9 1998/12/07 21:58:16 archie Exp $
+ *	$Id: ppbconf.c,v 1.10 1999/01/10 12:04:55 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -262,7 +262,7 @@ ppb_scan_bus(struct ppb_data *ppb)
 
 	ppb_1284_terminate(&pnpdev);
 
-	printf("ppc%d: IEEE1284 device found ", ppb->ppb_link->adapter_unit);
+	printf("ppb%d: IEEE1284 device found ", ppb->ppb_link->adapter_unit);
 
 	if (!(error = ppb_1284_negociate(&pnpdev, PPB_NIBBLE, 0))) {
 		printf("/NIBBLE");
@@ -318,8 +318,6 @@ ppb_scan_bus(struct ppb_data *ppb)
 		ppb_1284_terminate(&pnpdev);
         }
 
-	printf(" in FORWARD_IDLE state\n");
-
 	/* detect PnP devices */
 	ppb->class_id = ppb_pnp_detect(ppb, &pnpdev);
 
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 80bfa7b..c47e4ab 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.h,v 1.9 1998/09/20 14:41:54 nsouch Exp $
+ *	$Id: ppbconf.h,v 1.10 1999/01/10 12:04:55 nsouch Exp $
  *
  */
 #ifndef __PPBCONF_H
@@ -201,12 +201,12 @@ struct ppb_adapter {
 	void (*insw_epp)(int, char *, int);
 	void (*insl_epp)(int, char *, int);
 
-	char (*r_dtr)(int);
-	char (*r_str)(int);
-	char (*r_ctr)(int);
-	char (*r_epp)(int);
-	char (*r_ecr)(int);
-	char (*r_fifo)(int);
+	u_char (*r_dtr)(int);
+	u_char (*r_str)(int);
+	u_char (*r_ctr)(int);
+	u_char (*r_epp)(int);
+	u_char (*r_ecr)(int);
+	u_char (*r_fifo)(int);
 
 	void (*w_dtr)(int, char);
 	void (*w_str)(int, char);
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index d2bc7a1..bd6249b 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.13 1998/12/30 00:37:42 hoek Exp $
+ *	$Id: ppc.c,v 1.14 1999/01/10 12:04:53 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -113,12 +113,12 @@ static void ppc_insw_epp(int unit, char *addr, int cnt) {
 static void ppc_insl_epp(int unit, char *addr, int cnt) {
 	insl(ppcdata[unit]->ppc_base + PPC_EPP_DATA, addr, cnt); }
 
-static char ppc_rdtr(int unit) { return r_dtr(ppcdata[unit]); }
-static char ppc_rstr(int unit) { return r_str(ppcdata[unit]); }
-static char ppc_rctr(int unit) { return r_ctr(ppcdata[unit]); }
-static char ppc_repp(int unit) { return r_epp(ppcdata[unit]); }
-static char ppc_recr(int unit) { return r_ecr(ppcdata[unit]); }
-static char ppc_rfifo(int unit) { return r_fifo(ppcdata[unit]); }
+static u_char ppc_rdtr(int unit) { return r_dtr(ppcdata[unit]); }
+static u_char ppc_rstr(int unit) { return r_str(ppcdata[unit]); }
+static u_char ppc_rctr(int unit) { return r_ctr(ppcdata[unit]); }
+static u_char ppc_repp(int unit) { return r_epp(ppcdata[unit]); }
+static u_char ppc_recr(int unit) { return r_ecr(ppcdata[unit]); }
+static u_char ppc_rfifo(int unit) { return r_fifo(ppcdata[unit]); }
 
 static void ppc_wdtr(int unit, char byte) { w_dtr(ppcdata[unit], byte); }
 static void ppc_wstr(int unit, char byte) { w_str(ppcdata[unit], byte); }
@@ -318,7 +318,7 @@ ppc_detect_port(struct ppc_data *ppc)
 
 	w_ctr(ppc, 0x0c);	/* To avoid missing PS2 ports */
 	w_dtr(ppc, 0xaa);
-	if (r_dtr(ppc) != (char) 0xaa)
+	if (r_dtr(ppc) != 0xaa)
 		return (0);
 
 	return (1);
@@ -1128,7 +1128,7 @@ ppc_exec_microseq(int unit, struct ppb_microseq **p_msq)
 	struct ppb_microseq *stack = 0;
 
 /* microsequence registers are equivalent to PC-like port registers */
-#define r_reg(register,ppc) ((char)inb((ppc)->ppc_base + register))
+#define r_reg(register,ppc) (inb((ppc)->ppc_base + register))
 #define w_reg(register,ppc,byte) outb((ppc)->ppc_base + register, byte)
 
 #define INCR_PC (mi ++)		/* increment program counter */
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index 829bfd1..c847e6c 100644
--- a/sys/dev/ppc/ppcreg.h
+++ b/sys/dev/ppc/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.5 1998/10/31 11:37:09 nsouch Exp $
+ *	$Id: ppcreg.h,v 1.6 1999/01/10 12:04:53 nsouch Exp $
  *
  */
 #ifndef __PPCREG_H
@@ -122,14 +122,14 @@ struct ppc_data {
 #define PPC_DISABLE_INTR	(PPC_SERVICE_INTR | PPC_nFAULT_INTR)
 #define PPC_ECR_RESET		(PPC_ECR_PS2 | PPC_DISABLE_INTR)
 
-#define r_dtr(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_DTR))
-#define r_str(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_STR))
-#define r_ctr(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_CTR))
-#define r_epp(ppc) ((char)inb((ppc)->ppc_base + PPC_EPP_DATA))
-#define r_cnfgA(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_CNFGA))
-#define r_cnfgB(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_CNFGB))
-#define r_ecr(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_ECR))
-#define r_fifo(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_D_FIFO))
+#define r_dtr(ppc) (inb((ppc)->ppc_base + PPC_SPP_DTR))
+#define r_str(ppc) (inb((ppc)->ppc_base + PPC_SPP_STR))
+#define r_ctr(ppc) (inb((ppc)->ppc_base + PPC_SPP_CTR))
+#define r_epp(ppc) (inb((ppc)->ppc_base + PPC_EPP_DATA))
+#define r_cnfgA(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGA))
+#define r_cnfgB(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGB))
+#define r_ecr(ppc) (inb((ppc)->ppc_base + PPC_ECP_ECR))
+#define r_fifo(ppc) (inb((ppc)->ppc_base + PPC_ECP_D_FIFO))
 
 #define w_dtr(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_DTR, byte)
 #define w_str(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_STR, byte)
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index d2bc7a1..bd6249b 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.13 1998/12/30 00:37:42 hoek Exp $
+ *	$Id: ppc.c,v 1.14 1999/01/10 12:04:53 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -113,12 +113,12 @@ static void ppc_insw_epp(int unit, char *addr, int cnt) {
 static void ppc_insl_epp(int unit, char *addr, int cnt) {
 	insl(ppcdata[unit]->ppc_base + PPC_EPP_DATA, addr, cnt); }
 
-static char ppc_rdtr(int unit) { return r_dtr(ppcdata[unit]); }
-static char ppc_rstr(int unit) { return r_str(ppcdata[unit]); }
-static char ppc_rctr(int unit) { return r_ctr(ppcdata[unit]); }
-static char ppc_repp(int unit) { return r_epp(ppcdata[unit]); }
-static char ppc_recr(int unit) { return r_ecr(ppcdata[unit]); }
-static char ppc_rfifo(int unit) { return r_fifo(ppcdata[unit]); }
+static u_char ppc_rdtr(int unit) { return r_dtr(ppcdata[unit]); }
+static u_char ppc_rstr(int unit) { return r_str(ppcdata[unit]); }
+static u_char ppc_rctr(int unit) { return r_ctr(ppcdata[unit]); }
+static u_char ppc_repp(int unit) { return r_epp(ppcdata[unit]); }
+static u_char ppc_recr(int unit) { return r_ecr(ppcdata[unit]); }
+static u_char ppc_rfifo(int unit) { return r_fifo(ppcdata[unit]); }
 
 static void ppc_wdtr(int unit, char byte) { w_dtr(ppcdata[unit], byte); }
 static void ppc_wstr(int unit, char byte) { w_str(ppcdata[unit], byte); }
@@ -318,7 +318,7 @@ ppc_detect_port(struct ppc_data *ppc)
 
 	w_ctr(ppc, 0x0c);	/* To avoid missing PS2 ports */
 	w_dtr(ppc, 0xaa);
-	if (r_dtr(ppc) != (char) 0xaa)
+	if (r_dtr(ppc) != 0xaa)
 		return (0);
 
 	return (1);
@@ -1128,7 +1128,7 @@ ppc_exec_microseq(int unit, struct ppb_microseq **p_msq)
 	struct ppb_microseq *stack = 0;
 
 /* microsequence registers are equivalent to PC-like port registers */
-#define r_reg(register,ppc) ((char)inb((ppc)->ppc_base + register))
+#define r_reg(register,ppc) (inb((ppc)->ppc_base + register))
 #define w_reg(register,ppc,byte) outb((ppc)->ppc_base + register, byte)
 
 #define INCR_PC (mi ++)		/* increment program counter */
diff --git a/sys/i386/isa/ppcreg.h b/sys/i386/isa/ppcreg.h
index 829bfd1..c847e6c 100644
--- a/sys/i386/isa/ppcreg.h
+++ b/sys/i386/isa/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.5 1998/10/31 11:37:09 nsouch Exp $
+ *	$Id: ppcreg.h,v 1.6 1999/01/10 12:04:53 nsouch Exp $
  *
  */
 #ifndef __PPCREG_H
@@ -122,14 +122,14 @@ struct ppc_data {
 #define PPC_DISABLE_INTR	(PPC_SERVICE_INTR | PPC_nFAULT_INTR)
 #define PPC_ECR_RESET		(PPC_ECR_PS2 | PPC_DISABLE_INTR)
 
-#define r_dtr(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_DTR))
-#define r_str(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_STR))
-#define r_ctr(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_CTR))
-#define r_epp(ppc) ((char)inb((ppc)->ppc_base + PPC_EPP_DATA))
-#define r_cnfgA(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_CNFGA))
-#define r_cnfgB(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_CNFGB))
-#define r_ecr(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_ECR))
-#define r_fifo(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_D_FIFO))
+#define r_dtr(ppc) (inb((ppc)->ppc_base + PPC_SPP_DTR))
+#define r_str(ppc) (inb((ppc)->ppc_base + PPC_SPP_STR))
+#define r_ctr(ppc) (inb((ppc)->ppc_base + PPC_SPP_CTR))
+#define r_epp(ppc) (inb((ppc)->ppc_base + PPC_EPP_DATA))
+#define r_cnfgA(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGA))
+#define r_cnfgB(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGB))
+#define r_ecr(ppc) (inb((ppc)->ppc_base + PPC_ECP_ECR))
+#define r_fifo(ppc) (inb((ppc)->ppc_base + PPC_ECP_D_FIFO))
 
 #define w_dtr(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_DTR, byte)
 #define w_str(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_STR, byte)
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c
index d2bc7a1..bd6249b 100644
--- a/sys/isa/ppc.c
+++ b/sys/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.13 1998/12/30 00:37:42 hoek Exp $
+ *	$Id: ppc.c,v 1.14 1999/01/10 12:04:53 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -113,12 +113,12 @@ static void ppc_insw_epp(int unit, char *addr, int cnt) {
 static void ppc_insl_epp(int unit, char *addr, int cnt) {
 	insl(ppcdata[unit]->ppc_base + PPC_EPP_DATA, addr, cnt); }
 
-static char ppc_rdtr(int unit) { return r_dtr(ppcdata[unit]); }
-static char ppc_rstr(int unit) { return r_str(ppcdata[unit]); }
-static char ppc_rctr(int unit) { return r_ctr(ppcdata[unit]); }
-static char ppc_repp(int unit) { return r_epp(ppcdata[unit]); }
-static char ppc_recr(int unit) { return r_ecr(ppcdata[unit]); }
-static char ppc_rfifo(int unit) { return r_fifo(ppcdata[unit]); }
+static u_char ppc_rdtr(int unit) { return r_dtr(ppcdata[unit]); }
+static u_char ppc_rstr(int unit) { return r_str(ppcdata[unit]); }
+static u_char ppc_rctr(int unit) { return r_ctr(ppcdata[unit]); }
+static u_char ppc_repp(int unit) { return r_epp(ppcdata[unit]); }
+static u_char ppc_recr(int unit) { return r_ecr(ppcdata[unit]); }
+static u_char ppc_rfifo(int unit) { return r_fifo(ppcdata[unit]); }
 
 static void ppc_wdtr(int unit, char byte) { w_dtr(ppcdata[unit], byte); }
 static void ppc_wstr(int unit, char byte) { w_str(ppcdata[unit], byte); }
@@ -318,7 +318,7 @@ ppc_detect_port(struct ppc_data *ppc)
 
 	w_ctr(ppc, 0x0c);	/* To avoid missing PS2 ports */
 	w_dtr(ppc, 0xaa);
-	if (r_dtr(ppc) != (char) 0xaa)
+	if (r_dtr(ppc) != 0xaa)
 		return (0);
 
 	return (1);
@@ -1128,7 +1128,7 @@ ppc_exec_microseq(int unit, struct ppb_microseq **p_msq)
 	struct ppb_microseq *stack = 0;
 
 /* microsequence registers are equivalent to PC-like port registers */
-#define r_reg(register,ppc) ((char)inb((ppc)->ppc_base + register))
+#define r_reg(register,ppc) (inb((ppc)->ppc_base + register))
 #define w_reg(register,ppc,byte) outb((ppc)->ppc_base + register, byte)
 
 #define INCR_PC (mi ++)		/* increment program counter */
diff --git a/sys/isa/ppcreg.h b/sys/isa/ppcreg.h
index 829bfd1..c847e6c 100644
--- a/sys/isa/ppcreg.h
+++ b/sys/isa/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.5 1998/10/31 11:37:09 nsouch Exp $
+ *	$Id: ppcreg.h,v 1.6 1999/01/10 12:04:53 nsouch Exp $
  *
  */
 #ifndef __PPCREG_H
@@ -122,14 +122,14 @@ struct ppc_data {
 #define PPC_DISABLE_INTR	(PPC_SERVICE_INTR | PPC_nFAULT_INTR)
 #define PPC_ECR_RESET		(PPC_ECR_PS2 | PPC_DISABLE_INTR)
 
-#define r_dtr(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_DTR))
-#define r_str(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_STR))
-#define r_ctr(ppc) ((char)inb((ppc)->ppc_base + PPC_SPP_CTR))
-#define r_epp(ppc) ((char)inb((ppc)->ppc_base + PPC_EPP_DATA))
-#define r_cnfgA(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_CNFGA))
-#define r_cnfgB(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_CNFGB))
-#define r_ecr(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_ECR))
-#define r_fifo(ppc) ((char)inb((ppc)->ppc_base + PPC_ECP_D_FIFO))
+#define r_dtr(ppc) (inb((ppc)->ppc_base + PPC_SPP_DTR))
+#define r_str(ppc) (inb((ppc)->ppc_base + PPC_SPP_STR))
+#define r_ctr(ppc) (inb((ppc)->ppc_base + PPC_SPP_CTR))
+#define r_epp(ppc) (inb((ppc)->ppc_base + PPC_EPP_DATA))
+#define r_cnfgA(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGA))
+#define r_cnfgB(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGB))
+#define r_ecr(ppc) (inb((ppc)->ppc_base + PPC_ECP_ECR))
+#define r_fifo(ppc) (inb((ppc)->ppc_base + PPC_ECP_D_FIFO))
 
 #define w_dtr(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_DTR, byte)
 #define w_str(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_STR, byte)