Trying accommodate to the present SPI/TWI naming scheme

Author: hovercraft-github

simavr/sim/avr/avr_mcu_section.h

@@ -74,16 +74,16 @@ enum {
 };
 
 #define BITBANG_ON_SPI(_name) \
-	((uint64_t)(_name - '0') << 0)
+	((uint64_t)(_name >= '0' ? ((1 << (_name - '0'))&0xFF) : (1 << 8)) << 0)
 
 #define BITBANG_ON_UART(_name) \
-	((uint64_t)(_name - '0') << 8)
+	((uint64_t)((1 << (_name - '0'))&0xFF) << 16)
 
 #define BITBANG_ON_TWI(_name) \
-	((uint64_t)(_name - '0') << 16)
+	((uint64_t)(1) << 24)
 
 #define BITBANG_ON_LIN(_name) \
-	((uint64_t)(_name - '0') << 24)
+	((uint64_t)(1) << 32)
 
 #if __AVR__
 /*
@@ -163,8 +163,8 @@ struct avr_mmcu_vcd_trace_t {
  * module to ensure it's implemented).
  * By default bitbang is off for every peripheral.
  * You can turn it on using bitmask for specific peripheral instance,
- * e.g. the following turns it on for SPI0 and SPI1:
- *	AVR_MCU_BITBANG(BITBANG_ON_SPI('0') | BITBANG_ON_SPI('1'));
+ * e.g. the following turns it on for SPI0 and for USART1 in SPI mode:
+ *	AVR_MCU_BITBANG(BITBANG_ON_SPI(0) | BITBANG_ON_SPI('1'));
  */
 #define AVR_MCU_BITBANG(_peripheral_on_mask) \
 	AVR_MCU_LONGLONG(AVR_MMCU_TAG_BITBANG, _peripheral_on_mask)

simavr/sim/avr_spi.h

@@ -78,7 +78,7 @@ void avr_spi_init(avr_t * avr, avr_spi_t * port);
 
 #define AVR_SPIX_DECLARE(_name, _prr, _prspi, _ss_pin_port, _p_sck, _p_miso, _p_mosi, _p_ss) \
 	.spi = { \
-		.name = '0' + _name,\
+		.name = _name, \
 		.disabled = AVR_IO_REGBIT(_prr, _prspi), \
 	\
 		.r_spdr = SPDR ## _name, \
@@ -108,7 +108,7 @@ void avr_spi_init(avr_t * avr, avr_spi_t * port);
 
 #define AVR_SPI_DECLARE(_prr, _prspi, _ss_pin_port, _p_sck, _p_miso, _p_mosi, _p_ss) \
 	.spi = { \
-		.name = '0', \
+		.name = 0, \
 		.disabled = AVR_IO_REGBIT(_prr, _prspi), \
 	\
 		.r_spdr = SPDR, \

simavr/sim/sim_elf.c

@@ -107,14 +107,20 @@ avr_load_firmware(
 	avr_set_command_register(avr, firmware->command_register_addr);
 	avr_set_console_register(avr, firmware->console_register_addr);
 
-	// initialize bitbang mode
+	// initialize bitbang mode for multi-instance peripherals
 	for (char name = '0'; name < '9'; name++) {
 		if ((firmware->bitbang_on_mask & BITBANG_ON_SPI(name)) != 0) {
 			uint32_t f = 0;
 			avr_ioctl(avr, AVR_IOCTL_SPI_GET_FLAGS(name), &f);
 			f |= AVR_SPI_FLAG_BITBANG_ON;
 			avr_ioctl(avr, AVR_IOCTL_SPI_SET_FLAGS(name), &f);
 		}
+		if ((firmware->bitbang_on_mask & BITBANG_ON_SPI(name - '0')) != 0) {
+			uint32_t f = 0;
+			avr_ioctl(avr, AVR_IOCTL_SPI_GET_FLAGS(name), &f);
+			f |= AVR_SPI_FLAG_BITBANG_ON;
+			avr_ioctl(avr, AVR_IOCTL_SPI_SET_FLAGS(name), &f);
+		}
 		if ((firmware->bitbang_on_mask & BITBANG_ON_UART(name)) != 0) {
 			//TODO: implement bitbang mode for UART modeule
 		}