projects
/
simavr
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e0d79d
)
adc: Convert logging to AVR_LOG()
author
Jakob Gruber
<jakob.gruber@gmail.com>
Thu, 2 Aug 2012 08:29:51 +0000
(10:29 +0200)
committer
Jakob Gruber
<jakob.gruber@gmail.com>
Fri, 10 Aug 2012 14:17:20 +0000
(16:17 +0200)
simavr/sim/avr_adc.c
patch
|
blob
|
history
diff --git
a/simavr/sim/avr_adc.c
b/simavr/sim/avr_adc.c
index
689abf7
..
a88f335
100644
(file)
--- a/
simavr/sim/avr_adc.c
+++ b/
simavr/sim/avr_adc.c
@@
-71,7
+71,7
@@
static uint8_t avr_adc_read_l(struct avr_t * avr, avr_io_addr_t addr, void * par
break;
case ADC_MUX_VCC4:
if ( !avr->vcc) {
break;
case ADC_MUX_VCC4:
if ( !avr->vcc) {
-
printf("ADC Warning
: missing VCC analog voltage\n");
+
AVR_LOG(avr, LOG_WARNING, "ADC
: missing VCC analog voltage\n");
} else
reg = avr->vcc / 4;
break;
} else
reg = avr->vcc / 4;
break;
@@
-80,19
+80,19
@@
static uint8_t avr_adc_read_l(struct avr_t * avr, avr_io_addr_t addr, void * par
switch (ref) {
case ADC_VREF_VCC:
if (!avr->vcc)
switch (ref) {
case ADC_VREF_VCC:
if (!avr->vcc)
-
printf("ADC Warning
: missing VCC analog voltage\n");
+
AVR_LOG(avr, LOG_WARNING, "ADC
: missing VCC analog voltage\n");
else
vref = avr->vcc;
break;
case ADC_VREF_AREF:
if (!avr->aref)
else
vref = avr->vcc;
break;
case ADC_VREF_AREF:
if (!avr->aref)
-
printf("ADC Warning
: missing AREF analog voltage\n");
+
AVR_LOG(avr, LOG_WARNING, "ADC
: missing AREF analog voltage\n");
else
vref = avr->aref;
break;
case ADC_VREF_AVCC:
if (!avr->avcc)
else
vref = avr->aref;
break;
case ADC_VREF_AVCC:
if (!avr->avcc)
-
printf("ADC Warning
: missing AVCC analog voltage\n");
+
AVR_LOG(avr, LOG_WARNING, "ADC
: missing AVCC analog voltage\n");
else
vref = avr->avcc;
break;
else
vref = avr->avcc;
break;
@@
-105,7
+105,7
@@
static uint8_t avr_adc_read_l(struct avr_t * avr, avr_io_addr_t addr, void * par
reg = (reg * 0x3ff) / vref; // scale to 10 bits ADC
// printf("ADC to 10 bits 0x%x %d\n", reg, reg);
if (reg > 0x3ff) {
reg = (reg * 0x3ff) / vref; // scale to 10 bits ADC
// printf("ADC to 10 bits 0x%x %d\n", reg, reg);
if (reg > 0x3ff) {
-
printf("ADC Warning
channel %d clipped %u/%u VREF %d\n", mux.kind, reg, 0x3ff, vref);
+
AVR_LOG(avr, LOG_WARNING, "ADC:
channel %d clipped %u/%u VREF %d\n", mux.kind, reg, 0x3ff, vref);
reg = 0x3ff;
}
reg <<= shift;
reg = 0x3ff;
}
reg <<= shift;
@@
-155,7
+155,7
@@
static void avr_adc_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, voi
if (!aden && avr_regbit_get(avr, p->aden)) {
// first conversion
p->first = 1;
if (!aden && avr_regbit_get(avr, p->aden)) {
// first conversion
p->first = 1;
-
printf("ADC
Start AREF %d AVCC %d\n", avr->aref, avr->avcc);
+
AVR_LOG(avr, LOG_TRACE, "ADC:
Start AREF %d AVCC %d\n", avr->aref, avr->avcc);
}
if (aden && !avr_regbit_get(avr, p->aden)) {
// stop ADC
}
if (aden && !avr_regbit_get(avr, p->aden)) {
// stop ADC
@@
-178,7
+178,7
@@
static void avr_adc_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, voi
div = avr->frequency >> div;
if (p->first)
div = avr->frequency >> div;
if (p->first)
-
printf("ADC
starting at %uKHz\n", div / 13 / 100);
+
AVR_LOG(avr, LOG_TRACE, "ADC:
starting at %uKHz\n", div / 13 / 100);
div /= p->first ? 25 : 13; // first cycle is longer
avr_cycle_timer_register(avr,
div /= p->first ? 25 : 13; // first cycle is longer
avr_cycle_timer_register(avr,