Revision 60fe76f3 hw/ide.c

b/hw/ide.c
471 471
    put_le16(p + 5, 512); /* XXX: retired, remove ? */
472 472
    put_le16(p + 6, s->sectors);
473 473
    snprintf(buf, sizeof(buf), "QM%05d", s->drive_serial);
474
    padstr((uint8_t *)(p + 10), buf, 20); /* serial number */
474
    padstr((char *)(p + 10), buf, 20); /* serial number */
475 475
    put_le16(p + 20, 3); /* XXX: retired, remove ? */
476 476
    put_le16(p + 21, 512); /* cache size in sectors */
477 477
    put_le16(p + 22, 4); /* ecc bytes */
478
    padstr((uint8_t *)(p + 23), QEMU_VERSION, 8); /* firmware version */
479
    padstr((uint8_t *)(p + 27), "QEMU HARDDISK", 40); /* model */
478
    padstr((char *)(p + 23), QEMU_VERSION, 8); /* firmware version */
479
    padstr((char *)(p + 27), "QEMU HARDDISK", 40); /* model */
480 480
#if MAX_MULT_SECTORS > 1
481 481
    put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS);
482 482
#endif
......
536 536
    /* Removable CDROM, 50us response, 12 byte packets */
537 537
    put_le16(p + 0, (2 << 14) | (5 << 8) | (1 << 7) | (2 << 5) | (0 << 0));
538 538
    snprintf(buf, sizeof(buf), "QM%05d", s->drive_serial);
539
    padstr((uint8_t *)(p + 10), buf, 20); /* serial number */
539
    padstr((char *)(p + 10), buf, 20); /* serial number */
540 540
    put_le16(p + 20, 3); /* buffer type */
541 541
    put_le16(p + 21, 512); /* cache size in sectors */
542 542
    put_le16(p + 22, 4); /* ecc bytes */
543
    padstr((uint8_t *)(p + 23), QEMU_VERSION, 8); /* firmware version */
544
    padstr((uint8_t *)(p + 27), "QEMU CD-ROM", 40); /* model */
543
    padstr((char *)(p + 23), QEMU_VERSION, 8); /* firmware version */
544
    padstr((char *)(p + 27), "QEMU CD-ROM", 40); /* model */
545 545
    put_le16(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */
546 546
#ifdef USE_DMA_CDROM
547 547
    put_le16(p + 49, 1 << 9 | 1 << 8); /* DMA and LBA supported */
......
591 591
    put_le16(p + 7, s->nb_sectors >> 16);	/* Sectors per card */
592 592
    put_le16(p + 8, s->nb_sectors);		/* Sectors per card */
593 593
    snprintf(buf, sizeof(buf), "QM%05d", s->drive_serial);
594
    padstr((uint8_t *)(p + 10), buf, 20);	/* Serial number in ASCII */
594
    padstr((char *)(p + 10), buf, 20);	/* Serial number in ASCII */
595 595
    put_le16(p + 22, 0x0004);			/* ECC bytes */
596
    padstr((uint8_t *) (p + 23), QEMU_VERSION, 8);	/* Firmware Revision */
597
    padstr((uint8_t *) (p + 27), "QEMU MICRODRIVE", 40);/* Model number */
596
    padstr((char *) (p + 23), QEMU_VERSION, 8);	/* Firmware Revision */
597
    padstr((char *) (p + 27), "QEMU MICRODRIVE", 40);/* Model number */
598 598
#if MAX_MULT_SECTORS > 1
599 599
    put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS);
600 600
#else

Also available in: Unified diff