From 7d5ab433ca91b3e314b76f3884f615ae5a579e57 Mon Sep 17 00:00:00 2001 From: Stefan Rueger Date: Tue, 22 Nov 2022 17:11:33 +0000 Subject: [PATCH] Replace gratuitous references to slave and master with technical terms --- src/avrdude.1 | 14 +++++++------- src/avrintel.c | 12 ++++++------ src/avrintel.h | 2 +- src/doc/avrdude.texi | 12 ++++++------ src/stk500.c | 2 +- src/stk500v2.c | 14 +++++++------- src/stk500v2_private.h | 12 ++++++------ 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/avrdude.1 b/src/avrdude.1 index 3a8953e3..48ef8d09 100644 --- a/src/avrdude.1 +++ b/src/avrdude.1 @@ -114,7 +114,7 @@ programmer type can be used to directly connect to and program a chip using the built in interfaces on the computer. The requirements to use this type are that an SPI interface is exposed along with one GPIO pin. The GPIO serves as the reset output since the Linux SPI drivers -do not hold slave select down when a transfer is not occurring and thus +do not hold chip select down when a transfer is not occurring and thus it cannot be used as the reset pin. A readily available level translator should be used between the SPI bus/reset GPIO and the chip to avoid potentially damaging the computer's SPI controller in the @@ -301,7 +301,7 @@ file. Finally, a ``terminal'' mode is available that allows one to interactively communicate with the MCU, and to display or program individual memory cells. On the STK500 and STK600 programmer, several operational parameters (target supply -voltage, target Aref voltage, master clock) can be examined and changed +voltage, target Aref voltage, programming clock) can be examined and changed from within terminal mode as well. .Ss Options In order to control all the different operation modi, a number of options @@ -959,7 +959,7 @@ can be omitted. .It Ar spi Enter direct SPI mode. The .Em pgmled -pin acts as slave select. +pin acts as chip select. .Em Supported on parallel bitbang programmers, and partially by USBtiny. .It Ar pgm Return to programming mode (from direct SPI mode). @@ -981,7 +981,7 @@ can be selected by the optional argument (either 0 or 1). .Em Supported on the STK500 and STK600 programmer. .It Ar fosc freq Ns Op M Ns \&| Ns k -Set the master oscillator to +Set the programming oscillator to .Ar freq Hz. An optional trailing letter @@ -991,7 +991,7 @@ multiplies by 1E6, a trailing letter by 1E3. .Em Supported on the STK500 and STK600 programmer. .It Ar fosc off -Turn the master oscillator off. +Turn the programming oscillator off. .Em Supported on the STK500 and STK600 programmer. .It Ar sck period .Em STK500 and STK600 programmer: @@ -1009,7 +1009,7 @@ This parameter can also be used on the JTAG ICE mkII, JTAGICE3, and Atmel-ICE to ISP clock period when operating the ICE in ISP mode. .It Ar parms .Em STK500 and STK600 programmer: -Display the current voltage and master oscillator parameters. +Display the current voltage and programming oscillator parameters. .Em JTAG ICE: Display the current target supply voltage and JTAG bit clock rate/period. .Em Other programmers: @@ -1529,7 +1529,7 @@ The USBasp and USBtinyISP drivers do not offer any option to distinguish multipl devices connected simultaneously, so effectively only a single device is supported. .Pp -Slave Select must be externally held low for direct SPI when +Chip Select must be externally held low for direct SPI when using USBtinyISP, and send must be a multiple of four bytes. .Pp The avrftdi driver allows one to select specific devices using any combination of vid,pid diff --git a/src/avrintel.c b/src/avrintel.c index a74d964e..0db46b80 100644 --- a/src/avrintel.c +++ b/src/avrintel.c @@ -9,7 +9,7 @@ * meta-author Stefan Rueger * * v 1.1 - * 20.11.2022 + * 22.11.2022 * */ @@ -447,7 +447,7 @@ const char * const vtab_attiny20[vts_attiny20] = { // ATtiny20 "TIM0_OVF", // 11: Timer 0 Overflow "ANA_COMP", // 12: Analog Comparator "ADC_ADC", // 13: Conversion Complete - "TWI_SLAVE", // 14: 2-Wire Interface Periphery + "TWI_PERIPHERY", // 14: 2-Wire Interface Periphery "SPI", // 15: SPI Serial Peripheral Interface "QTRIP", // 16: Touch Sensing }; @@ -468,7 +468,7 @@ const char * const vtab_attiny40[vts_attiny40] = { // ATtiny40 "TIM0_OVF", // 12: Timer 0 Overflow "ANA_COMP", // 13: Analog Comparator "ADC", // 14: ADC Conversion Complete - "TWI_SLAVE", // 15: 2-Wire Interface Periphery + "TWI_PERIPHERY", // 15: 2-Wire Interface Periphery "SPI", // 16: SPI Serial Peripheral Interface "QTRIP", // 17: Touch Sensing }; @@ -691,7 +691,7 @@ const char * const vtab_attiny828[vts_attiny828] = { // ATtiny828 "ADC", // 20: ADC Conversion Complete "EE_READY", // 21: EEPROM Ready "ANALOG_COMP", // 22: Analog Comparator - "TWI_SLAVE", // 23: 2-Wire Interface Periphery + "TWI_PERIPHERY", // 23: 2-Wire Interface Periphery "SPM_Ready", // 24: Store Program Memory Ready "QTRIP", // 25: Touch Sensing }; @@ -726,7 +726,7 @@ const char * const vtab_attiny841[vts_attiny841] = { // ATtiny841, ATtiny441 "USART1_RX", // 26: USART 1 Receive Complete "USART1_UDRE", // 27: USART 1 Data Register Empty "USART1_TX", // 28: USART 1 Transmit Complete - "TWI_SLAVE", // 29: 2-Wire Interface Periphery + "TWI_PERIPHERY", // 29: 2-Wire Interface Periphery }; const char * const vtab_attiny861a[vts_attiny861a] = { // ATtiny861A, ATtiny861, ATtiny461A, ATtiny461, ATtiny261A, ATtiny261 @@ -777,7 +777,7 @@ const char * const vtab_attiny1634[vts_attiny1634] = { // ATtiny1634 "USART1_TXC", // 22: USART 1 Transmit Complete "USI_START", // 23: USI Start Condition "USI_OVERFLOW", // 24: USI Overflow - "TWI/TWI_SLAVE", // 25: 2-Wire Interface/2-Wire Interface Periphery + "TWI/TWI_PERIPHERY", // 25: 2-Wire Interface/2-Wire Interface Periphery "EE_RDY", // 26: EEPROM Ready "QTRIP", // 27: Touch Sensing }; diff --git a/src/avrintel.h b/src/avrintel.h index 0ab72822..22cea9df 100644 --- a/src/avrintel.h +++ b/src/avrintel.h @@ -9,7 +9,7 @@ * meta-author Stefan Rueger * * v 1.1 - * 20.11.2022 + * 22.11.2022 * */ diff --git a/src/doc/avrdude.texi b/src/doc/avrdude.texi index ed4a47f3..9b63911f 100644 --- a/src/doc/avrdude.texi +++ b/src/doc/avrdude.texi @@ -180,7 +180,7 @@ programmer type can be used to directly connect to and program a chip using the built in interfaces on the computer. The requirements to use this type are that an SPI interface is exposed along with one GPIO pin. The GPIO serves as the reset output since the Linux SPI drivers -do not hold slave select down when a transfer is not occuring and thus +do not hold chip select down when a transfer is not occuring and thus it cannot be used as the reset pin. A readily available level translator should be used between the SPI bus/reset GPIO and the chip to avoid potentially damaging the computer's SPI controller in the @@ -1518,9 +1518,9 @@ command. When using direct SPI mode, up to 3 bytes can be omitted. @item spi -Enter direct SPI mode. The @emph{pgmled} pin acts as slave select. +Enter direct SPI mode. The @emph{pgmled} pin acts as chip select. @emph{Only supported on parallel bitbang programmers, and partially by USBtiny.} -Slave Select must be externally held low for direct SPI when +Chip Select must be externally held low for direct SPI when using USBtinyISP, and send must be a multiple of four bytes. @item pgm @@ -1538,12 +1538,12 @@ selected by the optional parameter @var{channel} (either 0 or 1). @item fosc @var{freq}[@code{M}|@code{k}] -Set the master oscillator to @var{freq} Hz. +Set the programming oscillator to @var{freq} Hz. An optional trailing letter @code{M} multiplies by 1E6, a trailing letter @code{k} by 1E3. @item fosc off -Turn the master oscillator off. +Turn the programming oscillator off. @item sck @var{period} @emph{STK500 and STK600 only:} @@ -1558,7 +1558,7 @@ ISP clock period when operating the ICE in ISP mode. @item parms @emph{STK500 and STK600 only:} -Display the current voltage and master oscillator parameters. +Display the current voltage and programming oscillator parameters. @emph{JTAG ICE only:} Display the current target supply voltage and JTAG bit clock rate/period. diff --git a/src/stk500.c b/src/stk500.c index 7f26691a..b7788a59 100644 --- a/src/stk500.c +++ b/src/stk500.c @@ -1033,7 +1033,7 @@ static int stk500_set_fosc(const PROGRAMMER *pgm, double v) { /* This code assumes that each count of the SCK duration parameter - represents 8/f, where f is the clock frequency of the STK500 master + represents 8/f, where f is the clock frequency of the STK500 controller processors (not the target). This number comes from Atmel application note AVR061. It appears that the STK500 bit bangs SCK. For small duration values, the actual SCK width is larger than diff --git a/src/stk500v2.c b/src/stk500v2.c index 4294b12f..6a6085a1 100644 --- a/src/stk500v2.c +++ b/src/stk500v2.c @@ -3038,14 +3038,14 @@ static void stk500v2_display(const PROGRAMMER *pgm, const char *p) { stk500v2_getparm(pgm, PARAM_SW_MAJOR, &maj); stk500v2_getparm(pgm, PARAM_SW_MINOR, &min); msg_info("%sHardware Version: %d\n", p, hdw); - msg_info("%sFirmware Version Master : %d.%02d\n", p, maj, min); + msg_info("%sFirmware Version Controller : %d.%02d\n", p, maj, min); if (PDATA(pgm)->pgmtype == PGMTYPE_STK600) { - stk500v2_getparm(pgm, PARAM_SW_MAJOR_SLAVE1, &maj_s1); - stk500v2_getparm(pgm, PARAM_SW_MINOR_SLAVE1, &min_s1); - stk500v2_getparm(pgm, PARAM_SW_MAJOR_SLAVE2, &maj_s2); - stk500v2_getparm(pgm, PARAM_SW_MINOR_SLAVE2, &min_s2); - msg_info("%sFirmware Version Slave 1: %d.%02d\n", p, maj_s1, min_s1); - msg_info("%sFirmware Version Slave 2: %d.%02d\n", p, maj_s2, min_s2); + stk500v2_getparm(pgm, PARAM_SW_MAJOR_PERIPHERY1, &maj_s1); + stk500v2_getparm(pgm, PARAM_SW_MINOR_PERIPHERY1, &min_s1); + stk500v2_getparm(pgm, PARAM_SW_MAJOR_PERIPHERY2, &maj_s2); + stk500v2_getparm(pgm, PARAM_SW_MINOR_PERIPHERY2, &min_s2); + msg_info("%sFirmware Version Periphery 1: %d.%02d\n", p, maj_s1, min_s1); + msg_info("%sFirmware Version Periphery 2: %d.%02d\n", p, maj_s2, min_s2); } } diff --git a/src/stk500v2_private.h b/src/stk500v2_private.h index 8a08daf3..560f143e 100644 --- a/src/stk500v2_private.h +++ b/src/stk500v2_private.h @@ -149,8 +149,8 @@ // hw_status // Bits in status variable -// Bit 0-3: Slave MCU -// Bit 4-7: Master MCU +// Bit 0-3: Periphery MCU +// Bit 4-7: Controller MCU #define STATUS_AREF_ERROR 0 // Set to '1' if AREF is short circuited @@ -191,10 +191,10 @@ #define PARAM_SOCKETCARD_ID 0xA5 #define PARAM_ROUTINGCARD_ID 0xA6 #define PARAM_EXPCARD_ID 0xA7 -#define PARAM_SW_MAJOR_SLAVE1 0xA8 -#define PARAM_SW_MINOR_SLAVE1 0xA9 -#define PARAM_SW_MAJOR_SLAVE2 0xAA -#define PARAM_SW_MINOR_SLAVE2 0xAB +#define PARAM_SW_MAJOR_PERIPHERY1 0xA8 +#define PARAM_SW_MINOR_PERIPHERY1 0xA9 +#define PARAM_SW_MAJOR_PERIPHERY2 0xAA +#define PARAM_SW_MINOR_PERIPHERY2 0xAB #define PARAM_BOARD_ID_STATUS 0xAD #define PARAM_RESET 0xB4