CVS commit: src/sys/arch/amiga/clockport

[Radoslaw Kujawa]

Module Name:    src
Committed By:   rkujawa
Date:           Thu Jun 28 18:55:04 UTC 2012

Modified Files:
        src/sys/arch/amiga/clockport: a1k2cp.c clockport.c clockportvar.h

Log Message:
Obtain sc using device_private(), cosmetic changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/clockport/a1k2cp.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/clockport/clockport.c \
    src/sys/arch/amiga/clockport/clockportvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/amiga/clockport/a1k2cp.c
diff -u src/sys/arch/amiga/clockport/a1k2cp.c:1.1 src/sys/arch/amiga/clockport/a1k2cp.c:1.2
--- src/sys/arch/amiga/clockport/a1k2cp.c:1.1	Tue Apr 17 09:59:03 2012
+++ src/sys/arch/amiga/clockport/a1k2cp.c	Thu Jun 28 18:55:03 2012
@@ -1,4 +1,4 @@
-/*      $NetBSD: a1k2cp.c,v 1.1 2012/04/17 09:59:03 rkujawa Exp $ */
+/*      $NetBSD: a1k2cp.c,v 1.2 2012/06/28 18:55:03 rkujawa Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ a1k2cp_attach(device_t parent, device_t 
 	a1k2cp_aa.cp_intr_establish = clockport_generic_intr_establish;
 
 #ifdef A1K2CP_DEBUG
-	aprint_normal_dev(sc->sc_dev, "pa %d va %p", 
+	aprint_normal_dev(sc->sc_dev, "pa %x va %p\n", 
 	    A1K2CP_BASE, (void*) a1k2cp_bst.base);
 #endif /* A1K2CP_DEBUG */
 

Index: src/sys/arch/amiga/clockport/clockport.c
diff -u src/sys/arch/amiga/clockport/clockport.c:1.2 src/sys/arch/amiga/clockport/clockport.c:1.3
--- src/sys/arch/amiga/clockport/clockport.c:1.2	Fri May 18 20:52:02 2012
+++ src/sys/arch/amiga/clockport/clockport.c	Thu Jun 28 18:55:03 2012
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockport.c,v 1.2 2012/05/18 20:52:02 rkujawa Exp $ */
+/*      $NetBSD: clockport.c,v 1.3 2012/06/28 18:55:03 rkujawa Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@ clockport_attach(device_t parent, device
 
         aprint_normal("\n");
 
-	sc = (struct clockportbus_softc *) self;
+	sc = device_private(self);
 	sc->cpb_aa = (struct clockportbus_attach_args *) aux;
 
 	config_search_ia(clockport_submatch, self, "clockport", 0);
Index: src/sys/arch/amiga/clockport/clockportvar.h
diff -u src/sys/arch/amiga/clockport/clockportvar.h:1.2 src/sys/arch/amiga/clockport/clockportvar.h:1.3
--- src/sys/arch/amiga/clockport/clockportvar.h:1.2	Tue May 15 17:35:43 2012
+++ src/sys/arch/amiga/clockport/clockportvar.h	Thu Jun 28 18:55:03 2012
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockportvar.h,v 1.2 2012/05/15 17:35:43 rkujawa Exp $ */
+/*      $NetBSD: clockportvar.h,v 1.3 2012/06/28 18:55:03 rkujawa Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@ struct gencp_softc {
 };
 
 struct clockportbus_softc {
+	device_t	sc_dev;
 
 	struct clockportbus_attach_args *cpb_aa;
 };