Module Name: src
Committed By: jakllsch
Date: Tue Jul 27 19:40:17 UTC 2010
Modified Files:
src/sys/dev/ic: hd64570var.h
Log Message:
Use bus_addr_t for physical addresses.
For some reason the driver will put virtual addresses in these variables,
so I'd say this still not quite right. Oh well, at least it compiles on LP64.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/hd64570var.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/dev/ic/hd64570var.h
diff -u src/sys/dev/ic/hd64570var.h:1.9 src/sys/dev/ic/hd64570var.h:1.10
--- src/sys/dev/ic/hd64570var.h:1.9 Tue Jan 19 22:06:24 2010
+++ src/sys/dev/ic/hd64570var.h Tue Jul 27 19:40:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570var.h,v 1.9 2010/01/19 22:06:24 pooka Exp $ */
+/* $NetBSD: hd64570var.h,v 1.10 2010/07/27 19:40:16 jakllsch Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -106,9 +106,9 @@
* of mapped memory described by sc_memt/sc_memh.
*/
u_int sp_ntxdesc; /* number of tx descriptors */
- u_int32_t sp_txdesc_p; /* paddress of first tx desc */
+ bus_addr_t sp_txdesc_p; /* paddress of first tx desc */
sca_desc_t *sp_txdesc; /* vaddress of first tx desc */
- u_int32_t sp_txbuf_p; /* paddress of first tx buffer */
+ bus_addr_t sp_txbuf_p; /* paddress of first tx buffer */
u_int8_t *sp_txbuf; /* vaddress of first tx buffer */
volatile u_int sp_txcur; /* last descriptor in chain */
@@ -116,9 +116,9 @@
volatile u_int sp_txstart; /* start descriptor */
u_int sp_nrxdesc; /* number of rx descriptors */
- u_int32_t sp_rxdesc_p; /* paddress of first rx desc */
+ bus_addr_t sp_rxdesc_p; /* paddress of first rx desc */
sca_desc_t *sp_rxdesc; /* vaddress of first rx desc */
- u_int32_t sp_rxbuf_p; /* paddress of first rx buffer */
+ bus_addr_t sp_rxbuf_p; /* paddress of first rx buffer */
u_int8_t *sp_rxbuf; /* vaddress of first rx buffer */
u_int sp_rxstart; /* index of first descriptor */
