Revision 376253ec hw/slavio_intctl.c

b/hw/slavio_intctl.c
23 23
 */
24 24
#include "hw.h"
25 25
#include "sun4m.h"
26
#include "console.h"
26
#include "monitor.h"
27 27

  
28 28
//#define DEBUG_IRQ_COUNT
29 29
//#define DEBUG_IRQ
......
219 219
    slavio_intctlm_mem_writel,
220 220
};
221 221

  
222
void slavio_pic_info(void *opaque)
222
void slavio_pic_info(Monitor *mon, void *opaque)
223 223
{
224 224
    SLAVIO_INTCTLState *s = opaque;
225 225
    int i;
226 226

  
227 227
    for (i = 0; i < MAX_CPUS; i++) {
228
        term_printf("per-cpu %d: pending 0x%08x\n", i,
229
                    s->slaves[i]->intreg_pending);
228
        monitor_printf(mon, "per-cpu %d: pending 0x%08x\n", i,
229
                       s->slaves[i]->intreg_pending);
230 230
    }
231
    term_printf("master: pending 0x%08x, disabled 0x%08x\n",
232
                s->intregm_pending, s->intregm_disabled);
231
    monitor_printf(mon, "master: pending 0x%08x, disabled 0x%08x\n",
232
                   s->intregm_pending, s->intregm_disabled);
233 233
}
234 234

  
235
void slavio_irq_info(void *opaque)
235
void slavio_irq_info(Monitor *mon, void *opaque)
236 236
{
237 237
#ifndef DEBUG_IRQ_COUNT
238
    term_printf("irq statistic code not compiled.\n");
238
    monitor_printf(mon, "irq statistic code not compiled.\n");
239 239
#else
240 240
    SLAVIO_INTCTLState *s = opaque;
241 241
    int i;
242 242
    int64_t count;
243 243

  
244
    term_printf("IRQ statistics:\n");
244
    monitor_printf(mon, "IRQ statistics:\n");
245 245
    for (i = 0; i < 32; i++) {
246 246
        count = s->irq_count[i];
247 247
        if (count > 0)
248
            term_printf("%2d: %" PRId64 "\n", i, count);
248
            monitor_printf(mon, "%2d: %" PRId64 "\n", i, count);
249 249
    }
250 250
#endif
251 251
}

Also available in: Unified diff