[src/netbsd-1-4]: src/sys/dev/ic Pull up revision 1.13 (requested by tsubai):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4dca5db373da
branches:  netbsd-1-4
changeset: 470659:4dca5db373da
user:      he <he%NetBSD.org@localhost>
date:      Sat Jun 03 18:28:44 2000 +0000

description:
Pull up revision 1.13 (requested by tsubai):
  Add support for PCI variants of Cyclom-4Y and -8Y cards.
  Also fixes PR#7175 (new serial controller).

diffstat:

 sys/dev/ic/cy.c |  32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diffs (123 lines):

diff -r 7476cef0ab6c -r 4dca5db373da sys/dev/ic/cy.c
--- a/sys/dev/ic/cy.c   Sat Jun 03 18:26:40 2000 +0000
+++ b/sys/dev/ic/cy.c   Sat Jun 03 18:28:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cy.c,v 1.10.8.1 2000/06/03 18:26:40 he Exp $   */
+/*     $NetBSD: cy.c,v 1.10.8.2 2000/06/03 18:28:44 he Exp $   */
 
 /*
  * cy.c
@@ -415,7 +415,7 @@
        struct tty *tp = cy->cy_tty;
 
 #ifdef CY_DEBUG
-       printf("%s: read port %d uio 0x%x flag 0x%x\n",
+       printf("%s: read port %d uio %p flag 0x%x\n",
            sc->sc_dev.dv_xname, port, uio, flag);
 #endif
 
@@ -438,7 +438,7 @@
        struct tty *tp = cy->cy_tty;
 
 #ifdef CY_DEBUG
-       printf("%s: write port %d uio 0x%x flag 0x%x\n",
+       printf("%s: write port %d uio %p flag 0x%x\n",
            sc->sc_dev.dv_xname, port, uio, flag);
 #endif
 
@@ -459,7 +459,7 @@
        struct tty *tp = cy->cy_tty;
 
 #ifdef CY_DEBUG
-       printf("%s: tty port %d tp 0x%x\n", sc->sc_dev.dv_xname, port, tp);
+       printf("%s: tty port %d tp %p\n", sc->sc_dev.dv_xname, port, tp);
 #endif
        return tp;
 }
@@ -483,7 +483,7 @@
        int error;
 
 #ifdef CY_DEBUG
-       printf("%s: port %d ioctl cmd 0x%x data 0x%x flag 0x%x\n",
+       printf("%s: port %d ioctl cmd 0x%lx data %p flag 0x%x\n",
            sc->sc_dev.dv_xname, port, cmd, data, flag);
 #endif
 
@@ -568,7 +568,7 @@
        int s;
 
 #ifdef CY_DEBUG
-       printf("%s: port %d start, tty 0x%x\n", sc->sc_dev.dv_xname, port, tp);
+       printf("%s: port %d start, tty %p\n", sc->sc_dev.dv_xname, port, tp);
 #endif
 
 
@@ -612,7 +612,7 @@
        int s;
 
 #ifdef CY_DEBUG
-       printf("%s: port %d stop tty 0x%x flag 0x%x\n",
+       printf("%s: port %d stop tty %p flag 0x%x\n",
            sc->sc_dev.dv_xname, port, tp, flag);
 #endif
 
@@ -648,7 +648,7 @@
        int s, opt;
 
 #ifdef CY_DEBUG
-       printf("%s: port %d param tty 0x%x termios 0x%x\n",
+       printf("%s: port %d param tty %p termios %p\n",
            sc->sc_dev.dv_xname, port, tp, t);
        printf("ispeed %d ospeed %d\n", t->c_ispeed, t->c_ospeed);
 #endif
@@ -1118,8 +1118,8 @@
                                    CD1400_RDSR);
 
 #ifdef CY_DEBUG
-                               printf("cy%d port %d recv exception, line_stat 0x%x, char 0x%x\n",
-                               card, cy->cy_port_num, line_stat, recv_data);
+                               printf("%s port %d recv exception, line_stat 0x%x, char 0x%x\n",
+                               sc->sc_dev.dv_xname, cy->cy_port_num, line_stat, recv_data);
 #endif
                                if (ISSET(line_stat, CD1400_RDSR_OE))
                                        cy->cy_fifo_overruns++;
@@ -1140,8 +1140,8 @@
                                n_chars = cd_read_reg(sc, cy->cy_chip,
                                    CD1400_RDCR);
 #ifdef CY_DEBUG
-                               printf("cy%d port %d receive ok %d chars\n",
-                                   card, cy->cy_port_num, n_chars);
+                               printf("%s port %d receive ok %d chars\n",
+                                   sc->sc_dev.dv_xname, cy->cy_port_num, n_chars);
 #endif
                                while (n_chars--) {
                                        *buf_p++ = 0;   /* status: OK */
@@ -1204,8 +1204,8 @@
                        modem_stat = cd_read_reg(sc, cy->cy_chip, CD1400_MSVR2);
 
 #ifdef CY_DEBUG
-                       printf("cy%d port %d modem line change, new stat 0x%x\n",
-                              card, cy->cy_port_num, modem_stat);
+                       printf("%s port %d modem line change, new stat 0x%x\n",
+                              sc->sc_dev.dv_xname, cy->cy_port_num, modem_stat);
 #endif
                        if (ISSET((cy->cy_carrier_stat ^ modem_stat), CD1400_MSVR2_CD)) {
                                SET(cy->cy_flags, CY_F_CARRIER_CHANGED);
@@ -1235,7 +1235,7 @@
                        cy->cy_tx_int_count++;
 #endif
 #ifdef CY_DEBUG
-                       printf("cy%d port %d tx service\n", card, 
+                       printf("%s port %d tx service\n", sc->sc_dev.dv_xname,
                            cy->cy_port_num);
 #endif
 
@@ -1356,7 +1356,7 @@
        u_int waitcnt = 5 * 8 * 1024;   /* approx 5 ms */
 
 #ifdef CY_DEBUG
-       printf("c1400_channel_cmd cy 0x%x command 0x%x\n", cy, cmd);
+       printf("c1400_channel_cmd cy %p command 0x%x\n", cy, cmd);
 #endif
 
        /* wait until cd1400 is ready to process a new command */