Partial cleanup to reduce ADC overhead

vintagepc · vintagepc · commit cd31d3b0f17b · 2023-11-04T10:40:24.000-04:00
diff --git a/hw/arm/prusa/parts/heater.c b/hw/arm/prusa/parts/heater.c
@@ -185,6 +185,7 @@ static void heater_reset(DeviceState *dev)
     s->thermalMass = ((float)s->mass10x)/10.f;
     s->ambientTemp = 18.f;
     s->currentTemp = s->ambientTemp;
+    qemu_set_irq(s->temp_out, s->currentTemp*256.f);
 }
 
 static int heater_process_action(P404ScriptIF *obj, unsigned int action, script_args args) {
diff --git a/hw/arm/prusa/parts/thermistor.c b/hw/arm/prusa/parts/thermistor.c
@@ -69,11 +69,7 @@ static int map(long x, long in_min, long in_max, long out_min, long out_max) {
     return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
 }
 
-static void thermistor_read_request(void *opaque, int n, int level) {
-    if (!level) {
-        return;
-    }
-	ThermistorState *s = opaque;
+static void thermistor_update_output(ThermistorState *s) {
     float value = s->use_custom ? s->custom_temp : s->temperature;
     qemu_set_irq(s->temp_out, 256U*value);
     if (s->table_index==0) {
@@ -122,7 +118,7 @@ static void thermistor_temp_in(void *opaque, int n, int level)
 	ThermistorState *s = opaque;
 	float fv = (float)(level) / 256.f;
 	s->temperature = fv;
-	qemu_set_irq(s->temp_out, level);
+	thermistor_update_output(s);
 }
 
 static int thermistor_process_action(P404ScriptIF *obj, unsigned int action, script_args args)
@@ -152,6 +148,7 @@ static int thermistor_process_action(P404ScriptIF *obj, unsigned int action, scr
             return ScriptLS_Unhandled;
 
     }
+    thermistor_update_output(s);
     return ScriptLS_Finished;
 }
 
@@ -206,14 +203,14 @@ static void thermistor_set_table(ThermistorState *s) {
             s->table_length = 0;
             break;
     }
+    thermistor_update_output(s);
 }
 
 static void thermistor_reset(DeviceState *dev)
 {
     ThermistorState *s = THERMISTOR(dev);
     s->temperature = s->start_temp;
     thermistor_set_table(s);
-    qemu_set_irq(s->temp_out, 256U*s->temperature);
 }
 
 OBJECT_DEFINE_TYPE_SIMPLE_WITH_INTERFACES(ThermistorState, thermistor, THERMISTOR, SYS_BUS_DEVICE, {TYPE_P404_SCRIPTABLE}, {NULL});
@@ -232,7 +229,7 @@ static void thermistor_init(Object *obj)
 
     qdev_init_gpio_out_named(DEVICE(obj), &s->temp_out, "temp_out_256x", 1);
 
-    qdev_init_gpio_in_named(DEVICE(obj),thermistor_read_request, "thermistor_read_request", 1);
+    // qdev_init_gpio_in_named(DEVICE(obj),thermistor_read_request, "thermistor_read_request", 1);
     qdev_init_gpio_in_named(DEVICE(obj),thermistor_temp_in, "thermistor_set_temperature", 1);
 
     s->oversampling = OVERSAMPLENR;
diff --git a/hw/arm/prusa/prusa-mk4.c b/hw/arm/prusa/prusa-mk4.c
@@ -581,7 +581,7 @@ static void mk4_init(MachineState *machine)
         qdev_prop_set_uint16(dev, "temp",cfg.temps.ambient[i]);
         qdev_prop_set_uint16(dev, "table_no", cfg.temps.table[i]);
         sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
-        qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, cfg.temps.adc[i]),"adc_read", cfg.temps.channel[i],  qdev_get_gpio_in_named(dev, "thermistor_read_request",0));
+        //qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, cfg.temps.adc[i]),"adc_read", cfg.temps.channel[i],  qdev_get_gpio_in_named(dev, "thermistor_read_request",0));
         qdev_connect_gpio_out_named(dev, "thermistor_value",0, qdev_get_gpio_in_named(stm32_soc_get_periph(dev_soc, cfg.temps.adc[i]),"adc_data_in",cfg.temps.channel[i]));
         if (i==T_NOZ)
 		{
@@ -689,7 +689,7 @@ static void mk4_init(MachineState *machine)
     DeviceState* vdev = qdev_new("powersource");
     qdev_prop_set_uint32(vdev,"mV",23900);
     sysbus_realize(SYS_BUS_DEVICE(vdev),&error_fatal);
-	qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_read", 3,  qdev_get_gpio_in_named(vdev, "adc_read_request",0));
+	// qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_read", 3,  qdev_get_gpio_in_named(vdev, "adc_read_request",0));
     qdev_connect_gpio_out_named(vdev, "v_sense",0,qdev_get_gpio_in_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_data_in",3));
     qdev_connect_gpio_out_named(vdev, "panic",0, qdev_get_gpio_in(stm32_soc_get_periph(dev_soc, STM32_P_GPIOG), 0));
 
@@ -704,15 +704,15 @@ static void mk4_init(MachineState *machine)
 			qdev_prop_set_uint32(vdev,"mA",currents[i]);
 			sysbus_realize(SYS_BUS_DEVICE(vdev),&error_fatal);
 			qdev_connect_gpio_out_named(vdev, "a_sense",0,qdev_get_gpio_in_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC3),"adc_data_in",channels[i]));
-			qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC3),"adc_read", channels[i],  qdev_get_gpio_in_named(vdev, "adc_read_request",0));
+			//qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC3),"adc_read", channels[i],  qdev_get_gpio_in_named(vdev, "adc_read_request",0));
 		}
 	}
 
     // Bed V, always on.
     vdev = qdev_new("powersource");
     qdev_prop_set_uint32(vdev,"mV",24000);
     sysbus_realize(SYS_BUS_DEVICE(vdev),&error_fatal);
-    qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_read", 5,  qdev_get_gpio_in_named(vdev, "adc_read_request",0));
+    // qdev_connect_gpio_out_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_read", 5,  qdev_get_gpio_in_named(vdev, "adc_read_request",0));
     qdev_connect_gpio_out_named(vdev, "v_sense",0,qdev_get_gpio_in_named(stm32_soc_get_periph(dev_soc, STM32_P_ADC1),"adc_data_in",5));
     //qdev_connect_gpio_out_named(vdev, "v_sense",0,qdev_get_gpio_in_named(dev,"1Y",0));
     // qdev_connect_gpio_out_named(vdev, "a_sense",0,qdev_get_gpio_in_named(dev,"2Y",1));
diff --git a/hw/arm/prusa/stm32f407/stm32f4xx_adc.c b/hw/arm/prusa/stm32f407/stm32f4xx_adc.c
@@ -207,7 +207,11 @@ static void stm32f4xx_adc_reset(DeviceState *dev)
     s->defs.HT = 0xFFF;
 
     memset(&s->adc_sequence,0,ADC_NUM_REG_CHANNELS);
-    memset(&s->adc_data,0,ADC_NUM_REG_CHANNELS*sizeof(int));
+    // We can't reset the data here because it might 
+    // clear the initial stuff sent by other device resets. 
+
+
+    //memset(&s->adc_data,0,ADC_NUM_REG_CHANNELS*sizeof(int));
     s->adc_sequence_position = 0;
 	s->adc_next_seq_pos = 0;
 
@@ -241,7 +245,7 @@ static uint32_t stm32f4xx_adc_get_value(STM32F4XXADCState *s)
 static void stm32f4xx_adc_data_in(void *opaque, int n, int level){
     STM32F4XXADCState *s = opaque;
     s->adc_data[n] = level;
-    // printf("ADC: Ch %d new data: %d\n",n, level);
+    // printf("%s: Ch %d new data: %d\n", _PERIPHNAMES[s->parent.periph], n, level);
 }
 
 static void stm32f4xx_adc_recalc_times(STM32F4XXADCState *s) {

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ static void heater_reset(DeviceState *dev)`
`185`	`185`	`s->thermalMass = ((float)s->mass10x)/10.f;`
`186`	`186`	`s->ambientTemp = 18.f;`
`187`	`187`	`s->currentTemp = s->ambientTemp;`
	`188`	`+ qemu_set_irq(s->temp_out, s->currentTemp*256.f);`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`static int heater_process_action(P404ScriptIF *obj, unsigned int action, script_args args) {`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,7 @@ static int map(long x, long in_min, long in_max, long out_min, long out_max) {`
`69`	`69`	`return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;`
`70`	`70`	`}`
`71`	`71`
`72`		`-static void thermistor_read_request(void *opaque, int n, int level) {`
`73`		`- if (!level) {`
`74`		`- return;`
`75`		`- }`
`76`		`- ThermistorState *s = opaque;`
	`72`	`+static void thermistor_update_output(ThermistorState *s) {`
`77`	`73`	`float value = s->use_custom ? s->custom_temp : s->temperature;`
`78`	`74`	`qemu_set_irq(s->temp_out, 256U*value);`
`79`	`75`	`if (s->table_index==0) {`
`@@ -122,7 +118,7 @@ static void thermistor_temp_in(void *opaque, int n, int level)`
`122`	`118`	`ThermistorState *s = opaque;`
`123`	`119`	`float fv = (float)(level) / 256.f;`
`124`	`120`	`s->temperature = fv;`
`125`		`- qemu_set_irq(s->temp_out, level);`
	`121`	`+ thermistor_update_output(s);`
`126`	`122`	`}`
`127`	`123`
`128`	`124`	`static int thermistor_process_action(P404ScriptIF *obj, unsigned int action, script_args args)`
`@@ -152,6 +148,7 @@ static int thermistor_process_action(P404ScriptIF *obj, unsigned int action, scr`
`152`	`148`	`return ScriptLS_Unhandled;`
`153`	`149`
`154`	`150`	`}`
	`151`	`+ thermistor_update_output(s);`
`155`	`152`	`return ScriptLS_Finished;`
`156`	`153`	`}`
`157`	`154`
`@@ -206,14 +203,14 @@ static void thermistor_set_table(ThermistorState *s) {`
`206`	`203`	`s->table_length = 0;`
`207`	`204`	`break;`
`208`	`205`	`}`
	`206`	`+ thermistor_update_output(s);`
`209`	`207`	`}`
`210`	`208`
`211`	`209`	`static void thermistor_reset(DeviceState *dev)`
`212`	`210`	`{`
`213`	`211`	`ThermistorState *s = THERMISTOR(dev);`
`214`	`212`	`s->temperature = s->start_temp;`
`215`	`213`	`thermistor_set_table(s);`
`216`		`- qemu_set_irq(s->temp_out, 256U*s->temperature);`
`217`	`214`	`}`
`218`	`215`
`219`	`216`	`OBJECT_DEFINE_TYPE_SIMPLE_WITH_INTERFACES(ThermistorState, thermistor, THERMISTOR, SYS_BUS_DEVICE, {TYPE_P404_SCRIPTABLE}, {NULL});`
`@@ -232,7 +229,7 @@ static void thermistor_init(Object *obj)`
`232`	`229`
`233`	`230`	`qdev_init_gpio_out_named(DEVICE(obj), &s->temp_out, "temp_out_256x", 1);`
`234`	`231`
`235`		`- qdev_init_gpio_in_named(DEVICE(obj),thermistor_read_request, "thermistor_read_request", 1);`
	`232`	`+ // qdev_init_gpio_in_named(DEVICE(obj),thermistor_read_request, "thermistor_read_request", 1);`
`236`	`233`	`qdev_init_gpio_in_named(DEVICE(obj),thermistor_temp_in, "thermistor_set_temperature", 1);`
`237`	`234`
`238`	`235`	`s->oversampling = OVERSAMPLENR;`