X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fcdrom.c;h=61d7f52e793a7c96ea3647371a839d780b253b51;hb=a1a2be8eb002e13b1eb6ccaca40e4396f8816402;hp=cfcd7bb9ac552adec3654ce5f32f669bcb90f30e;hpb=91f3c5195b3e0575f0288e95f1f7ac930b560db0;p=palacios.git diff --git a/palacios/src/devices/cdrom.c b/palacios/src/devices/cdrom.c index cfcd7bb..61d7f52 100644 --- a/palacios/src/devices/cdrom.c +++ b/palacios/src/devices/cdrom.c @@ -56,7 +56,7 @@ void cdrom_eject(struct cdrom_interface *cdrom) * Read CD TOC. Returns false if start track is out of bounds. */ static -rd_bool cdrom_read_toc(struct cdrom_interface *cdrom, uint8* buf, int* length, rd_bool msf, int start_track) +rd_bool cdrom_read_toc(struct cdrom_interface *cdrom, uint8_t* buf, int* length, rd_bool msf, int start_track) { Ramdisk_Print_CD("[cdrom_read_toc]\n"); return 1; @@ -66,7 +66,7 @@ rd_bool cdrom_read_toc(struct cdrom_interface *cdrom, uint8* buf, int* length, r * Return CD-ROM capacity (in 2048 byte frames) */ static -uint32 cdrom_capacity(struct cdrom_interface *cdrom) +uint32_t cdrom_capacity(struct cdrom_interface *cdrom) { Ramdisk_Print_CD("[cdrom_capacity] s_ramdiskSize = %d\n", cdrom->capacity_B); if (cdrom->lba) { @@ -87,13 +87,13 @@ uint32 cdrom_capacity(struct cdrom_interface *cdrom) * Read a single block from the CD */ static -void cdrom_read_block(struct cdrom_interface *cdrom, uint8* buf, int lba)// __attribute__(regparm(2)); +void cdrom_read_block(struct cdrom_interface *cdrom, uint8_t* buf, int lba)// __attribute__(regparm(2)); { V3_ASSERT(lba != 0); Ramdisk_Print_CD("[cdrom_read_block] lba = %d\n", lba); - memcpy(buf, (uint8 *)(cdrom->fd + lba*2048), 2048); + memcpy(buf, (uint8_t *)(cdrom->fd + lba*2048), 2048); return; }