Revision bee8d684 hw/ps2.c

b/hw/ps2.c
470 470

  
471 471
static void ps2_common_save (QEMUFile *f, PS2State *s)
472 472
{
473
    qemu_put_be32s (f, &s->write_cmd);
474
    qemu_put_be32s (f, &s->queue.rptr);
475
    qemu_put_be32s (f, &s->queue.wptr);
476
    qemu_put_be32s (f, &s->queue.count);
473
    qemu_put_be32 (f, s->write_cmd);
474
    qemu_put_be32 (f, s->queue.rptr);
475
    qemu_put_be32 (f, s->queue.wptr);
476
    qemu_put_be32 (f, s->queue.count);
477 477
    qemu_put_buffer (f, s->queue.data, sizeof (s->queue.data));
478 478
}
479 479

  
480 480
static void ps2_common_load (QEMUFile *f, PS2State *s)
481 481
{
482
    qemu_get_be32s (f, &s->write_cmd);
483
    qemu_get_be32s (f, &s->queue.rptr);
484
    qemu_get_be32s (f, &s->queue.wptr);
485
    qemu_get_be32s (f, &s->queue.count);
482
    s->write_cmd=qemu_get_be32 (f);
483
    s->queue.rptr=qemu_get_be32 (f);
484
    s->queue.wptr=qemu_get_be32 (f);
485
    s->queue.count=qemu_get_be32 (f);
486 486
    qemu_get_buffer (f, s->queue.data, sizeof (s->queue.data));
487 487
}
488 488

  
......
491 491
    PS2KbdState *s = (PS2KbdState*)opaque;
492 492

  
493 493
    ps2_common_save (f, &s->common);
494
    qemu_put_be32s(f, &s->scan_enabled);
495
    qemu_put_be32s(f, &s->translate);
494
    qemu_put_be32(f, s->scan_enabled);
495
    qemu_put_be32(f, s->translate);
496 496
}
497 497

  
498 498
static void ps2_mouse_save(QEMUFile* f, void* opaque)
......
506 506
    qemu_put_8s(f, &s->mouse_wrap);
507 507
    qemu_put_8s(f, &s->mouse_type);
508 508
    qemu_put_8s(f, &s->mouse_detect_state);
509
    qemu_put_be32s(f, &s->mouse_dx);
510
    qemu_put_be32s(f, &s->mouse_dy);
511
    qemu_put_be32s(f, &s->mouse_dz);
509
    qemu_put_be32(f, s->mouse_dx);
510
    qemu_put_be32(f, s->mouse_dy);
511
    qemu_put_be32(f, s->mouse_dz);
512 512
    qemu_put_8s(f, &s->mouse_buttons);
513 513
}
514 514

  
......
520 520
        return -EINVAL;
521 521

  
522 522
    ps2_common_load (f, &s->common);
523
    qemu_get_be32s(f, &s->scan_enabled);
524
    qemu_get_be32s(f, &s->translate);
523
    s->scan_enabled=qemu_get_be32(f);
524
    s->translate=qemu_get_be32(f);
525 525
    return 0;
526 526
}
527 527

  
......
539 539
    qemu_get_8s(f, &s->mouse_wrap);
540 540
    qemu_get_8s(f, &s->mouse_type);
541 541
    qemu_get_8s(f, &s->mouse_detect_state);
542
    qemu_get_be32s(f, &s->mouse_dx);
543
    qemu_get_be32s(f, &s->mouse_dy);
544
    qemu_get_be32s(f, &s->mouse_dz);
542
    s->mouse_dx=qemu_get_be32(f);
543
    s->mouse_dy=qemu_get_be32(f);
544
    s->mouse_dz=qemu_get_be32(f);
545 545
    qemu_get_8s(f, &s->mouse_buttons);
546 546
    return 0;
547 547
}

Also available in: Unified diff