More bugfixes..

Author: hovercraft-github

simavr/sim/avr_spi.c

@@ -63,7 +63,7 @@ static void avr_spi_bitbang_switch_mode(avr_spi_t * p, uint8_t master)
 		irq = avr_io_getirq( p->bit_bang.avr,
 										AVR_IOCTL_IOPORT_GETIRQ(p->p_miso.port),
 										IOPORT_IRQ_DIRECTION_ALL );
-		irq_val = irq->value & (1 << p->p_miso.pin);
+        irq_val = irq->value & ~(1 << p->p_miso.pin);
 		avr_raise_irq(irq, irq_val);
 		p->bit_bang.clk_generate = 1;
 	} else {
@@ -74,17 +74,17 @@ static void avr_spi_bitbang_switch_mode(avr_spi_t * p, uint8_t master)
 		irq = avr_io_getirq( p->bit_bang.avr,
 										AVR_IOCTL_IOPORT_GETIRQ(p->bit_bang.p_clk.port),
 										IOPORT_IRQ_DIRECTION_ALL );
-		irq_val = irq->value & (1 << p->bit_bang.p_clk.pin);
+        irq_val = irq->value & ~(1 << p->bit_bang.p_clk.pin);
 		avr_raise_irq(irq, irq_val);
 		irq = avr_io_getirq( p->bit_bang.avr,
 										AVR_IOCTL_IOPORT_GETIRQ(p->p_mosi.port),
 										IOPORT_IRQ_DIRECTION_ALL );
-		irq_val = irq->value & (1 << p->p_mosi.pin);
+        irq_val = irq->value & ~(1 << p->p_mosi.pin);
 		avr_raise_irq(irq, irq_val);
 		irq = avr_io_getirq( p->bit_bang.avr,
 										AVR_IOCTL_IOPORT_GETIRQ(p->p_ss.port),
 										IOPORT_IRQ_DIRECTION_ALL );
-		irq_val = irq->value & (1 << p->p_ss.pin);
+        irq_val = irq->value & ~(1 << p->p_ss.pin);
 		avr_raise_irq(irq, irq_val);
 		p->bit_bang.clk_generate = 0;
 	}
@@ -135,6 +135,7 @@ static void avr_spi_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, voi
 		avr_core_watch_write(avr, addr, v);
 		avr_bitbang_stop(&(p->bit_bang));
 		avr_bitbang_reset(avr, &(p->bit_bang));
+        p->bit_bang.data = p->output_data_register;
 		if (avr_regbit_get(avr, p->spe)) {
 			p->bit_bang.clk_phase = avr_regbit_get(avr, p->cpha);
 			p->bit_bang.clk_pol = avr_regbit_get(avr, p->cpol);
@@ -180,7 +181,8 @@ static void avr_spi_ss_hook(struct avr_irq_t * irq, uint32_t value, void * param
 			avr_bitbang_stop(&(p->bit_bang));
 			avr_bitbang_reset(p->bit_bang.avr, &(p->bit_bang));
 		} else {
-			avr_bitbang_start(&(p->bit_bang));
+            if (avr_regbit_get(p->bit_bang.avr, p->spe))
+				avr_bitbang_start(&(p->bit_bang));
 		}
 	}
 }