Some bug fixes..

Author: hovercraft-github

simavr/sim/avr/avr_mcu_section.h

@@ -143,7 +143,7 @@ struct avr_mmcu_vcd_trace_t {
 #define AVR_MCU_LONGLONG(_tag, _val) \
 	const struct avr_mmcu_longlong_t DO_CONCAT(DO_CONCAT(_, _tag), __LINE__) _MMCU_ = {\
 		.tag = _tag,\
-		.len = sizeof(struct avr_mmcu_long_t) - 2,\
+		.len = sizeof(struct avr_mmcu_longlong_t) - 2,\
 		.val = _val,\
 	}
 

simavr/sim/avr_spi.c

@@ -34,6 +34,8 @@ static avr_cycle_count_t avr_spi_raise(struct avr_t * avr, avr_cycle_count_t whe
 		}
 		// the last received byte will be echoed back the next time, unless user overrides it
 		p->output_data_register = p->input_data_register;
+		if (p->flags & AVR_SPI_FLAG_BITBANG_ON)
+			p->bit_bang.data = p->output_data_register;
 	}
 	return 0;
 }

simavr/sim/sim_elf.c

@@ -117,9 +117,9 @@ avr_load_firmware(
 		}
 		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);
+			avr_ioctl(avr, AVR_IOCTL_SPI_GET_FLAGS(name - '0'), &f);
 			f |= AVR_SPI_FLAG_BITBANG_ON;
-			avr_ioctl(avr, AVR_IOCTL_SPI_SET_FLAGS(name), &f);
+			avr_ioctl(avr, AVR_IOCTL_SPI_SET_FLAGS(name - '0'), &f);
 		}
 		if ((firmware->bitbang_on_mask & BITBANG_ON_UART(name)) != 0) {
 			//TODO: implement bitbang mode for UART modeule