avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace gratuitous references to slave and master with technical terms

This commit is contained in:
Stefan Rueger 2022-11-22 17:11:33 +00:00
parent adc333ea54
commit 7d5ab433ca
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/avrdude.1
View File

@ -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 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 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 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 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 translator should be used between the SPI bus/reset GPIO and the chip
to avoid potentially damaging the computer's SPI controller in the 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 interactively communicate with the MCU, and to display or program
individual memory cells. individual memory cells.
On the STK500 and STK600 programmer, several operational parameters (target supply 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. from within terminal mode as well.
.Ss Options .Ss Options
In order to control all the different operation modi, a number of options In order to control all the different operation modi, a number of options
@ -959,7 +959,7 @@ can be omitted.
.It Ar spi .It Ar spi
Enter direct SPI mode. The Enter direct SPI mode. The
.Em pgmled .Em pgmled
pin acts as slave select. pin acts as chip select.
.Em Supported on parallel bitbang programmers, and partially by USBtiny. .Em Supported on parallel bitbang programmers, and partially by USBtiny.
.It Ar pgm .It Ar pgm
Return to programming mode (from direct SPI mode). Return to programming mode (from direct SPI mode).
@ -981,7 +981,7 @@ can be selected by the optional
argument (either 0 or 1). argument (either 0 or 1).
.Em Supported on the STK500 and STK600 programmer. .Em Supported on the STK500 and STK600 programmer.
.It Ar fosc freq Ns Op M Ns \&| Ns k .It Ar fosc freq Ns Op M Ns \&| Ns k
Set the master oscillator to Set the programming oscillator to
.Ar freq .Ar freq
Hz. Hz.
An optional trailing letter An optional trailing letter
@ -991,7 +991,7 @@ multiplies by 1E6, a trailing letter
by 1E3. by 1E3.
.Em Supported on the STK500 and STK600 programmer. .Em Supported on the STK500 and STK600 programmer.
.It Ar fosc off .It Ar fosc off
Turn the master oscillator off. Turn the programming oscillator off.
.Em Supported on the STK500 and STK600 programmer. .Em Supported on the STK500 and STK600 programmer.
.It Ar sck period .It Ar sck period
.Em STK500 and STK600 programmer: .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. ISP clock period when operating the ICE in ISP mode.
.It Ar parms .It Ar parms
.Em STK500 and STK600 programmer: .Em STK500 and STK600 programmer:
Display the current voltage and master oscillator parameters. Display the current voltage and programming oscillator parameters.
.Em JTAG ICE: .Em JTAG ICE:
Display the current target supply voltage and JTAG bit clock rate/period. Display the current target supply voltage and JTAG bit clock rate/period.
.Em Other programmers: .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 devices connected simultaneously, so effectively only a single device
is supported. is supported.
.Pp .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. using USBtinyISP, and send must be a multiple of four bytes.
.Pp .Pp
The avrftdi driver allows one to select specific devices using any combination of vid,pid The avrftdi driver allows one to select specific devices using any combination of vid,pid

12
src/avrintel.c
View File

@ -9,7 +9,7 @@
* meta-author Stefan Rueger <stefan.rueger@urclocks.com> * meta-author Stefan Rueger <stefan.rueger@urclocks.com>
* *
* v 1.1 * 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 "TIM0_OVF", // 11: Timer 0 Overflow
"ANA_COMP", // 12: Analog Comparator "ANA_COMP", // 12: Analog Comparator
"ADC_ADC", // 13: Conversion Complete "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 "SPI", // 15: SPI Serial Peripheral Interface
"QTRIP", // 16: Touch Sensing "QTRIP", // 16: Touch Sensing
}; };
@ -468,7 +468,7 @@ const char * const vtab_attiny40[vts_attiny40] = { // ATtiny40
"TIM0_OVF", // 12: Timer 0 Overflow "TIM0_OVF", // 12: Timer 0 Overflow
"ANA_COMP", // 13: Analog Comparator "ANA_COMP", // 13: Analog Comparator
"ADC", // 14: ADC Conversion Complete "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 "SPI", // 16: SPI Serial Peripheral Interface
"QTRIP", // 17: Touch Sensing "QTRIP", // 17: Touch Sensing
}; };
@ -691,7 +691,7 @@ const char * const vtab_attiny828[vts_attiny828] = { // ATtiny828
"ADC", // 20: ADC Conversion Complete "ADC", // 20: ADC Conversion Complete
"EE_READY", // 21: EEPROM Ready "EE_READY", // 21: EEPROM Ready
"ANALOG_COMP", // 22: Analog Comparator "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 "SPM_Ready", // 24: Store Program Memory Ready
"QTRIP", // 25: Touch Sensing "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_RX", // 26: USART 1 Receive Complete
"USART1_UDRE", // 27: USART 1 Data Register Empty "USART1_UDRE", // 27: USART 1 Data Register Empty
"USART1_TX", // 28: USART 1 Transmit Complete "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 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 "USART1_TXC", // 22: USART 1 Transmit Complete
"USI_START", // 23: USI Start Condition "USI_START", // 23: USI Start Condition
"USI_OVERFLOW", // 24: USI Overflow "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 "EE_RDY", // 26: EEPROM Ready
"QTRIP", // 27: Touch Sensing "QTRIP", // 27: Touch Sensing
}; };

2
src/avrintel.h
View File

@ -9,7 +9,7 @@
* meta-author Stefan Rueger <stefan.rueger@urclocks.com> * meta-author Stefan Rueger <stefan.rueger@urclocks.com>
* *
* v 1.1 * v 1.1
* 20.11.2022 * 22.11.2022
* *
*/ */

12
src/doc/avrdude.texi
View File

@ -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 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 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 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 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 translator should be used between the SPI bus/reset GPIO and the chip
to avoid potentially damaging the computer's SPI controller in the 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. can be omitted.
@item spi @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.} @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. using USBtinyISP, and send must be a multiple of four bytes.
@item pgm @item pgm
@ -1538,12 +1538,12 @@ selected by the optional parameter @var{channel} (either
0 or 1). 0 or 1).
@item fosc @var{freq}[@code{M}|@code{k}] @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} An optional trailing letter @code{M}
multiplies by 1E6, a trailing letter @code{k} by 1E3. multiplies by 1E6, a trailing letter @code{k} by 1E3.
@item fosc off @item fosc off
Turn the master oscillator off. Turn the programming oscillator off.
@item sck @var{period} @item sck @var{period}
@emph{STK500 and STK600 only:} @emph{STK500 and STK600 only:}
@ -1558,7 +1558,7 @@ ISP clock period when operating the ICE in ISP mode.
@item parms @item parms
@emph{STK500 and STK600 only:} @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:} @emph{JTAG ICE only:}
Display the current target supply voltage and JTAG bit clock rate/period. Display the current target supply voltage and JTAG bit clock rate/period.

2
src/stk500.c
View File

@ -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 /* 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 processors (not the target). This number comes from Atmel
application note AVR061. It appears that the STK500 bit bangs SCK. application note AVR061. It appears that the STK500 bit bangs SCK.
For small duration values, the actual SCK width is larger than For small duration values, the actual SCK width is larger than

14
src/stk500v2.c
View File

@ -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_MAJOR, &maj);
stk500v2_getparm(pgm, PARAM_SW_MINOR, &min); stk500v2_getparm(pgm, PARAM_SW_MINOR, &min);
msg_info("%sHardware Version: %d\n", p, hdw); 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) { if (PDATA(pgm)->pgmtype == PGMTYPE_STK600) {
stk500v2_getparm(pgm, PARAM_SW_MAJOR_SLAVE1, &maj_s1); stk500v2_getparm(pgm, PARAM_SW_MAJOR_PERIPHERY1, &maj_s1);
stk500v2_getparm(pgm, PARAM_SW_MINOR_SLAVE1, &min_s1); stk500v2_getparm(pgm, PARAM_SW_MINOR_PERIPHERY1, &min_s1);
stk500v2_getparm(pgm, PARAM_SW_MAJOR_SLAVE2, &maj_s2); stk500v2_getparm(pgm, PARAM_SW_MAJOR_PERIPHERY2, &maj_s2);
stk500v2_getparm(pgm, PARAM_SW_MINOR_SLAVE2, &min_s2); stk500v2_getparm(pgm, PARAM_SW_MINOR_PERIPHERY2, &min_s2);
msg_info("%sFirmware Version Slave 1: %d.%02d\n", p, maj_s1, min_s1); msg_info("%sFirmware Version Periphery 1: %d.%02d\n", p, maj_s1, min_s1);
msg_info("%sFirmware Version Slave 2: %d.%02d\n", p, maj_s2, min_s2); msg_info("%sFirmware Version Periphery 2: %d.%02d\n", p, maj_s2, min_s2);
} }
} }

12
src/stk500v2_private.h
View File

@ -149,8 +149,8 @@
// hw_status // hw_status
// Bits in status variable // Bits in status variable
// Bit 0-3: Slave MCU // Bit 0-3: Periphery MCU
// Bit 4-7: Master MCU // Bit 4-7: Controller MCU
#define STATUS_AREF_ERROR 0 #define STATUS_AREF_ERROR 0
// Set to '1' if AREF is short circuited // Set to '1' if AREF is short circuited
@ -191,10 +191,10 @@
#define PARAM_SOCKETCARD_ID 0xA5 #define PARAM_SOCKETCARD_ID 0xA5
#define PARAM_ROUTINGCARD_ID 0xA6 #define PARAM_ROUTINGCARD_ID 0xA6
#define PARAM_EXPCARD_ID 0xA7 #define PARAM_EXPCARD_ID 0xA7
#define PARAM_SW_MAJOR_SLAVE1 0xA8 #define PARAM_SW_MAJOR_PERIPHERY1 0xA8
#define PARAM_SW_MINOR_SLAVE1 0xA9 #define PARAM_SW_MINOR_PERIPHERY1 0xA9
#define PARAM_SW_MAJOR_SLAVE2 0xAA #define PARAM_SW_MAJOR_PERIPHERY2 0xAA
#define PARAM_SW_MINOR_SLAVE2 0xAB #define PARAM_SW_MINOR_PERIPHERY2 0xAB
#define PARAM_BOARD_ID_STATUS 0xAD #define PARAM_BOARD_ID_STATUS 0xAD
#define PARAM_RESET 0xB4 #define PARAM_RESET 0xB4