Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Use consistent naming.



details:   https://anonhg.NetBSD.org/src/rev/6f41112a075b
branches:  trunk
changeset: 532708:6f41112a075b
user:      augustss <augustss%NetBSD.org@localhost>
date:      Thu Jun 13 15:27:23 2002 +0000

description:
Use consistent naming.

diffstat:

 sys/dev/ic/cpc700.c       |  12 ++++++------
 sys/dev/ic/iic_cpcbus.c   |   4 ++--
 sys/dev/ic/timer_cpcbus.c |   4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (62 lines):

diff -r b4d8a5ce4631 -r 6f41112a075b sys/dev/ic/cpc700.c
--- a/sys/dev/ic/cpc700.c       Thu Jun 13 15:27:09 2002 +0000
+++ b/sys/dev/ic/cpc700.c       Thu Jun 13 15:27:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpc700.c,v 1.1 2002/05/21 02:58:25 augustss Exp $      */
+/*     $NetBSD: cpc700.c,v 1.2 2002/06/13 15:27:23 augustss Exp $      */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -147,11 +147,11 @@
                bus_addr_t addr;
                int irq;
        } devs[] = {
-               { "com", CPC_COM0, CPC_IB_UART_0 },
-               { "com", CPC_COM1, CPC_IB_UART_1 },
-               { "timer", CPC_TIMER, CPCBUSCF_IRQ_DEFAULT },
-               { "iic", CPC_IIC0, CPC_IB_IIC_0 },
-               { "iic", CPC_IIC1, CPC_IB_IIC_1 },
+               { "com",    CPC_COM0, CPC_IB_UART_0 },
+               { "com",    CPC_COM1, CPC_IB_UART_1 },
+               { "cpctim", CPC_TIMER, CPCBUSCF_IRQ_DEFAULT },
+               { "cpciic", CPC_IIC0, CPC_IB_IIC_0 },
+               { "cpciic", CPC_IIC1, CPC_IB_IIC_1 },
                { NULL, 0 }
        };
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
diff -r b4d8a5ce4631 -r 6f41112a075b sys/dev/ic/iic_cpcbus.c
--- a/sys/dev/ic/iic_cpcbus.c   Thu Jun 13 15:27:09 2002 +0000
+++ b/sys/dev/ic/iic_cpcbus.c   Thu Jun 13 15:27:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iic_cpcbus.c,v 1.1 2002/05/21 02:58:25 augustss Exp $  */
+/*     $NetBSD: iic_cpcbus.c,v 1.2 2002/06/13 15:27:23 augustss Exp $  */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 {
        struct cpcbus_attach_args *caa = aux;
 
-       return (strcmp(caa->cpca_name, "iic") == 0);
+       return (strcmp(caa->cpca_name, "cpciic") == 0);
 }
 
 void
diff -r b4d8a5ce4631 -r 6f41112a075b sys/dev/ic/timer_cpcbus.c
--- a/sys/dev/ic/timer_cpcbus.c Thu Jun 13 15:27:09 2002 +0000
+++ b/sys/dev/ic/timer_cpcbus.c Thu Jun 13 15:27:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer_cpcbus.c,v 1.1 2002/05/21 02:58:25 augustss Exp $        */
+/*     $NetBSD: timer_cpcbus.c,v 1.2 2002/06/13 15:27:23 augustss Exp $        */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
 {
        struct cpcbus_attach_args *caa = aux;
 
-       return (strcmp(caa->cpca_name, "timer") == 0);
+       return (strcmp(caa->cpca_name, "cpctim") == 0);
 }
 
 void



Home | Main Index | Thread Index | Old Index