summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2006-11-26 17:31:32 +0000
committerdyoung <dyoung@NetBSD.org>2006-11-26 17:31:32 +0000
commitc11fb5eececf0f6c9c499b262e2bbbffb2d5ae93 (patch)
tree33a5e51d95e5125ade9305cc56a09aabbcc77e40 /sys/dev
parentf7fbd2e8b550e395de01d2d3365e2b2445e1118c (diff)
Add 'volatile' to rx/tx descriptor fields.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/atwreg.h18
-rw-r--r--sys/dev/ic/rtwreg.h22
2 files changed, 20 insertions, 20 deletions
diff --git a/sys/dev/ic/atwreg.h b/sys/dev/ic/atwreg.h
index 01bb8a7154d..71c59478384 100644
--- a/sys/dev/ic/atwreg.h
+++ b/sys/dev/ic/atwreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atwreg.h,v 1.15 2006/08/31 19:24:37 dyoung Exp $ */
+/* $NetBSD: atwreg.h,v 1.16 2006/11/26 17:31:32 dyoung Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved.
@@ -919,11 +919,11 @@
/* Tx descriptor */
struct atw_txdesc {
- u_int32_t at_ctl;
+ volatile uint32_t at_ctl;
#define at_stat at_ctl
- u_int32_t at_flags;
- u_int32_t at_buf1;
- u_int32_t at_buf2;
+ volatile uint32_t at_flags;
+ volatile uint32_t at_buf1;
+ volatile uint32_t at_buf2;
};
#define ATW_TXCTL_OWN __BIT(31) /* 1: ready to transmit */
@@ -953,10 +953,10 @@ struct atw_txdesc {
/* Rx descriptor */
struct atw_rxdesc {
- u_int32_t ar_stat;
- u_int32_t ar_ctl;
- u_int32_t ar_buf1;
- u_int32_t ar_buf2;
+ volatile uint32_t ar_stat;
+ volatile uint32_t ar_ctl;
+ volatile uint32_t ar_buf1;
+ volatile uint32_t ar_buf2;
};
#define ar_rssi ar_ctl
diff --git a/sys/dev/ic/rtwreg.h b/sys/dev/ic/rtwreg.h
index e54c3cbff4d..42d00c893f4 100644
--- a/sys/dev/ic/rtwreg.h
+++ b/sys/dev/ic/rtwreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwreg.h,v 1.20 2006/08/31 19:24:38 dyoung Exp $ */
+/* $NetBSD: rtwreg.h,v 1.21 2006/11/26 17:31:32 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -834,12 +834,12 @@
/* Tx descriptor */
struct rtw_txdesc {
- uint32_t td_ctl0;
- uint32_t td_ctl1;
- uint32_t td_buf;
- uint32_t td_len;
- uint32_t td_next;
- uint32_t td_rsvd[3];
+ volatile uint32_t td_ctl0;
+ volatile uint32_t td_ctl1;
+ volatile uint32_t td_buf;
+ volatile uint32_t td_len;
+ volatile uint32_t td_next;
+ volatile uint32_t td_rsvd[3];
};
#define td_stat td_ctl0
@@ -897,10 +897,10 @@ struct rtw_txdesc {
/* Rx descriptor */
struct rtw_rxdesc {
- uint32_t rd_ctl;
- uint32_t rd_rsvd0;
- uint32_t rd_buf;
- uint32_t rd_rsvd1;
+ volatile uint32_t rd_ctl;
+ volatile uint32_t rd_rsvd0;
+ volatile uint32_t rd_buf;
+ volatile uint32_t rd_rsvd1;
};
#define rd_stat rd_ctl