diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-03 20:00:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-03 20:00:37 +0000 |
| commit | 5770d332be4d6f553aa1e80f8a1fafce06e2a2f2 (patch) | |
| tree | 809323cd506025a7825d97fe9a1cbe241a6830e8 /sys/dev | |
| parent | acfb72bb12a882664f7ee89a89619c019a77598c (diff) | |
put the values direct in the array, otherwise the nested macros are longer
than standards permit
found & ok by jsg
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/atw.c | 18 | ||||
| -rw-r--r-- | sys/dev/ic/atwvar.h | 18 |
2 files changed, 16 insertions, 20 deletions
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c index df3570dfbe9..e89266a523e 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atw.c,v 1.65 2009/01/21 21:53:59 grange Exp $ */ +/* $OpenBSD: atw.c,v 1.66 2009/06/03 20:00:36 deraadt Exp $ */ /* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -264,8 +264,20 @@ void atw_si4126_tune(struct atw_softc *, u_int); void atw_si4126_write(struct atw_softc *, u_int, u_int); void atw_si4126_init(struct atw_softc *); -const struct atw_txthresh_tab atw_txthresh_tab_lo[] = ATW_TXTHRESH_TAB_LO_RATE; -const struct atw_txthresh_tab atw_txthresh_tab_hi[] = ATW_TXTHRESH_TAB_HI_RATE; +const struct atw_txthresh_tab atw_txthresh_tab_lo[] = { + { ATW_NAR_TR_L64, "64 bytes" }, + { ATW_NAR_TR_L160, "160 bytes" }, + { ATW_NAR_TR_L192, "192 bytes" }, + { ATW_NAR_SF, "store and forward" }, + { 0, NULL } +}; +const struct atw_txthresh_tab atw_txthresh_tab_hi[] = { + { ATW_NAR_TR_H96, "96 bytes" }, + { ATW_NAR_TR_H288, "288 bytes" }, + { ATW_NAR_TR_H544, "544 bytes" }, + { ATW_NAR_SF, "store and forward" }, + { 0, NULL } +}; struct cfdriver atw_cd = { NULL, "atw", DV_IFNET diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h index 8ec2e43a3ba..b3fcc5f9cd2 100644 --- a/sys/dev/ic/atwvar.h +++ b/sys/dev/ic/atwvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atwvar.h,v 1.16 2009/06/02 15:13:58 jsg Exp $ */ +/* $OpenBSD: atwvar.h,v 1.17 2009/06/03 20:00:36 deraadt Exp $ */ /* $NetBSD: atwvar.h,v 1.13 2004/07/23 07:07:55 dyoung Exp $ */ /* @@ -130,22 +130,6 @@ struct atw_txthresh_tab { const char *txth_name; /* name of mode */ }; -#define ATW_TXTHRESH_TAB_LO_RATE { \ - { ATW_NAR_TR_L64, "64 bytes" }, \ - { ATW_NAR_TR_L160, "160 bytes" }, \ - { ATW_NAR_TR_L192, "192 bytes" }, \ - { ATW_NAR_SF, "store and forward" }, \ - { 0, NULL }, \ -} - -#define ATW_TXTHRESH_TAB_HI_RATE { \ - { ATW_NAR_TR_H96, "96 bytes" }, \ - { ATW_NAR_TR_H288, "288 bytes" }, \ - { ATW_NAR_TR_H544, "544 bytes" }, \ - { ATW_NAR_SF, "store and forward" }, \ - { 0, NULL }, \ -} - enum atw_rftype { ATW_RFTYPE_INTERSIL = 0, ATW_RFTYPE_RFMD = 1, ATW_RFTYPE_MARVEL = 2 }; |