From 1de233a7c7fb2eca6f61682805aec0dda195a307 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Thu, 28 Mar 2013 14:24:28 -0300 Subject: [PATCH] tools/: fix artf_at86rf23[01] (should be atrf...) typo --- tools/atrf-id/atrf-id.c | 8 ++++---- tools/atrf-txrx/atrf-txrx.c | 6 +++--- tools/atrf-xtal/atben.c | 8 ++++---- tools/include/atrf.h | 8 ++++---- tools/lib/atrf.c | 4 ++-- tools/lib/cwtest.c | 16 ++++++++-------- tools/lib/misctxrx.c | 12 ++++++------ 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tools/atrf-id/atrf-id.c b/tools/atrf-id/atrf-id.c index 0679b35..3e0b319 100644 --- a/tools/atrf-id/atrf-id.c +++ b/tools/atrf-id/atrf-id.c @@ -1,8 +1,8 @@ /* * atrf-id/atrf-id.c - Identify a ben-wpan AT86RF230 board * - * Written 2010-2011 by Werner Almesberger - * Copyright 2010-2011 Werner Almesberger + * Written 2010-2011, 2013 by Werner Almesberger + * Copyright 2010-2011, 2013 Werner Almesberger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -135,10 +135,10 @@ static void show_info(struct atrf_dsc *dsc) case atrf_unknown_chip: printf("???"); break; - case artf_at86rf230: + case atrf_at86rf230: printf("AT86RF230"); break; - case artf_at86rf231: + case atrf_at86rf231: printf("AT86RF231"); break; default: diff --git a/tools/atrf-txrx/atrf-txrx.c b/tools/atrf-txrx/atrf-txrx.c index 972a991..348984b 100644 --- a/tools/atrf-txrx/atrf-txrx.c +++ b/tools/atrf-txrx/atrf-txrx.c @@ -112,7 +112,7 @@ static struct atrf_dsc *init_txrx(const char *driver, int trim, unsigned mhz) atrf_reg_write(dsc, REG_IRQ_MASK, 0xff); flush_interrupts(dsc); - if (atrf_identify(dsc) == artf_at86rf231) + if (atrf_identify(dsc) == atrf_at86rf231) wait_for_interrupt(dsc, IRQ_CCA_ED_DONE, IRQ_CCA_ED_DONE, 1); /* according to table 7-1, 37 us max */ @@ -131,10 +131,10 @@ static void set_rate(struct atrf_dsc *dsc, uint8_t rate) if (!rate) return; switch (atrf_identify(dsc)) { - case artf_at86rf230: + case atrf_at86rf230: fprintf(stderr, "AT86RF230 only supports 250 kbps\n"); break; - case artf_at86rf231: + case atrf_at86rf231: atrf_reg_write(dsc, REG_TRX_CTRL_2, rate); break; default: diff --git a/tools/atrf-xtal/atben.c b/tools/atrf-xtal/atben.c index 2f7a4d0..82cdd4b 100644 --- a/tools/atrf-xtal/atben.c +++ b/tools/atrf-xtal/atben.c @@ -1,8 +1,8 @@ /* * atrf-xtal/atben.c - ATBEN-specific driver and evaluation * - * Written 2011 by Werner Almesberger - * Copyright 2011 Werner Almesberger + * Written 2011, 2013 by Werner Almesberger + * Copyright 2011, 2013 Werner Almesberger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,10 +59,10 @@ static void rf_setup(struct atrf_dsc *dsc, int size, int trim) /* minimum TX power, maximize delays, disable CRC */ switch (atrf_identify(dsc)) { - case artf_at86rf230: + case atrf_at86rf230: atrf_reg_write(dsc, REG_PHY_TX_PWR, 0xf); break; - case artf_at86rf231: + case atrf_at86rf231: atrf_reg_write(dsc, REG_PHY_TX_PWR, 0xff); atrf_reg_write(dsc, REG_TRX_CTRL_1, 0); break; diff --git a/tools/include/atrf.h b/tools/include/atrf.h index 5472c46..b661e35 100644 --- a/tools/include/atrf.h +++ b/tools/include/atrf.h @@ -1,8 +1,8 @@ /* * include/atrf.h - ATRF access functions library * - * Written 2010-2011 by Werner Almesberger - * Copyright 2010-2011 Werner Almesberger + * Written 2010-2011, 2013 by Werner Almesberger + * Copyright 2010-2011, 2013 Werner Almesberger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,8 @@ enum atrf_chip_id { atrf_unknown_chip = 0, - artf_at86rf230 = 1, - artf_at86rf231 = 2, + atrf_at86rf230 = 1, + atrf_at86rf231 = 2, }; diff --git a/tools/lib/atrf.c b/tools/lib/atrf.c index 55d1be3..94bb85d 100644 --- a/tools/lib/atrf.c +++ b/tools/lib/atrf.c @@ -86,7 +86,7 @@ static enum atrf_chip_id identify(struct atrf_dsc *dsc) switch (version) { case 1: /* rev A */ case 2: /* rev B */ - return artf_at86rf230; + return atrf_at86rf230; default: return atrf_unknown_chip; } @@ -94,7 +94,7 @@ static enum atrf_chip_id identify(struct atrf_dsc *dsc) case 3: /* AT86RF231 */ switch (version) { case 2: /* rev A */ - return artf_at86rf231; + return atrf_at86rf231; default: return atrf_unknown_chip; } diff --git a/tools/lib/cwtest.c b/tools/lib/cwtest.c index 4705e2d..05688dd 100644 --- a/tools/lib/cwtest.c +++ b/tools/lib/cwtest.c @@ -1,8 +1,8 @@ /* * lib/cwtest.c - Set up AT86RF230/231 constant wave test mode * - * Written 2010-2011 by Werner Almesberger - * Copyright 2010-2011 Werner Almesberger + * Written 2010-2011, 2013 by Werner Almesberger + * Copyright 2010-2011, 2013 Werner Almesberger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ int cw_test_needs_reset(struct atrf_dsc *dsc) { if (atrf_usb_handle(dsc)) return 1; - if (atrf_identify(dsc) == artf_at86rf230) + if (atrf_identify(dsc) == atrf_at86rf230) return 1; return 0; } @@ -111,11 +111,11 @@ static void start_test_mode_231(struct atrf_dsc *dsc) void cw_test_begin(struct atrf_dsc *dsc, uint8_t cont_tx) { switch (atrf_identify(dsc)) { - case artf_at86rf230: + case atrf_at86rf230: enter_test_mode_230(dsc, cont_tx); last_cont_tx = cont_tx; break; - case artf_at86rf231: + case atrf_at86rf231: prepare_test_mode_231(dsc, cont_tx); start_test_mode_231(dsc); break; @@ -128,10 +128,10 @@ void cw_test_begin(struct atrf_dsc *dsc, uint8_t cont_tx) void cw_test_resume(struct atrf_dsc *dsc) { switch (atrf_identify(dsc)) { - case artf_at86rf230: + case atrf_at86rf230: enter_test_mode_230(dsc, last_cont_tx); break; - case artf_at86rf231: + case atrf_at86rf231: start_test_mode_231(dsc); break; default: @@ -142,7 +142,7 @@ void cw_test_resume(struct atrf_dsc *dsc) void cw_test_end(struct atrf_dsc *dsc) { - if (atrf_identify(dsc) == artf_at86rf231) + if (atrf_identify(dsc) == atrf_at86rf231) atrf_reg_write(dsc, REG_PART_NUM, 0); atrf_reg_write(dsc, REG_TRX_STATE, TRX_CMD_FORCE_TRX_OFF); diff --git a/tools/lib/misctxrx.c b/tools/lib/misctxrx.c index 216c8e2..89e79c9 100644 --- a/tools/lib/misctxrx.c +++ b/tools/lib/misctxrx.c @@ -1,8 +1,8 @@ /* * lib/misctxrx.c - Miscellaenous transceiver helper functions * - * Written 2010-2011 by Werner Almesberger - * Copyright 2010-2011 Werner Almesberger + * Written 2010-2011, 2013 by Werner Almesberger + * Copyright 2010-2011, 2013 Werner Almesberger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -146,11 +146,11 @@ void set_power_step(struct atrf_dsc *dsc, int power, int crc) uint8_t tmp; switch (atrf_identify(dsc)) { - case artf_at86rf230: + case atrf_at86rf230: atrf_reg_write(dsc, REG_PHY_TX_PWR, (crc ? TX_AUTO_CRC_ON_230 : 0) | power); break; - case artf_at86rf231: + case atrf_at86rf231: tmp = atrf_reg_read(dsc, REG_PHY_TX_PWR); tmp = (tmp & ~TX_PWR_MASK) | power; atrf_reg_write(dsc, REG_PHY_TX_PWR, tmp); @@ -166,9 +166,9 @@ void set_power_step(struct atrf_dsc *dsc, int power, int crc) static const double *tx_power_table(struct atrf_dsc *dsc) { switch (atrf_identify(dsc)) { - case artf_at86rf230: + case atrf_at86rf230: return tx_pwr_230; - case artf_at86rf231: + case atrf_at86rf231: return tx_pwr_231; break; default: