diff options
| author |   stsp <stsp@openbsd.org> | 2019-01-15 22:08:32 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2019-01-15 22:08:32 +0000 |
| commit | 1de0d41af50ce65e7e51a1766386ca642eb02053 (patch) | |
| tree | 7f8173e4ef18d19799dde954fa89bc910f3d5478 | |
| parent | Remove an unused variable. Spotted by clang. (diff) | |
| download | wireguard-openbsd-1de0d41af50ce65e7e51a1766386ca642eb02053.tar.xz wireguard-openbsd-1de0d41af50ce65e7e51a1766386ca642eb02053.zip | |
Make otus(4) modify its DMA_TRIGGER register with readable macros
instead of magic numbers. No functional change.
ok kettenis@
| -rw-r--r-- | sys/dev/usb/if_otus.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_otusreg.h | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index a136d5eec76..cb7e65865ad 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.62 2019/01/12 16:12:10 stsp Exp $ */ +/* $OpenBSD: if_otus.c,v 1.63 2019/01/15 22:08:32 stsp Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -2275,7 +2275,7 @@ otus_init(struct ifnet *ifp) } /* Start Rx. */ - otus_write(sc, 0x1c3d30, 0x100); + otus_write(sc, AR_MAC_REG_DMA_TRIGGER, AR_DMA_TRIGGER_RXQ); (void)otus_write_barrier(sc); ifp->if_flags |= IFF_RUNNING; @@ -2311,7 +2311,7 @@ otus_stop(struct ifnet *ifp) splx(s); /* Stop Rx. */ - otus_write(sc, 0x1c3d30, 0); + otus_write(sc, AR_MAC_REG_DMA_TRIGGER, 0); (void)otus_write_barrier(sc); sc->tx_queued = 0; diff --git a/sys/dev/usb/if_otusreg.h b/sys/dev/usb/if_otusreg.h index 0777cd5649e..6188a2a02ae 100644 --- a/sys/dev/usb/if_otusreg.h +++ b/sys/dev/usb/if_otusreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otusreg.h,v 1.10 2017/04/08 02:57:25 deraadt Exp $ */ +/* $OpenBSD: if_otusreg.h,v 1.11 2019/01/15 22:08:32 stsp Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -72,6 +72,15 @@ #define AR_MAC_REG_OFDM_PHY_ERRORS (AR_MAC_REG_BASE + 0xcb4) #define AR_MAC_REG_CCK_PHY_ERRORS (AR_MAC_REG_BASE + 0xcb8) #define AR_MAC_REG_BCN_HT1 (AR_MAC_REG_BASE + 0xda0) +#define AR_MAC_REG_DMA_TRIGGER (AR_MAC_REG_BASE + 0xd30) + +/* Possible values for register AR_MAC_REG_DMA_TRIGGER. */ +#define AR_DMA_TRIGGER_TXQ0 0x001 +#define AR_DMA_TRIGGER_TXQ1 0x002 +#define AR_DMA_TRIGGER_TXQ2 0x004 +#define AR_DMA_TRIGGER_TXQ3 0x008 +#define AR_DMA_TRIGGER_TXQ4 0x010 +#define AR_DMA_TRIGGER_RXQ 0x100 /* Possible values for register AR_USB_MODE_CTRL. */ #define AR_USB_DS_ENA (1 << 0) |