claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed all the CD-ROM files to the new agreed upon coding style.

Browse Source
This commit is contained in:
OBattler
2022-02-22 22:04:40 +01:00
parent 2acddd2969
commit 960cae34d4
6 changed files with 1026 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1104
src/cdrom/cdrom.c
View File

File diff suppressed because it is too large Load Diff

80
src/cdrom/cdrom_image.c
View File

@@ -8,8 +8,6 @@
* *
* CD-ROM image support. * CD-ROM image support.
* *
*
*
* Author: RichardG867, * Author: RichardG867,
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* bit, * bit,
@@ -61,7 +59,7 @@ cdrom_image_log(const char *fmt, ...)
/* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong: /* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong:
there is a seeming 2 seconds in which audio plays but counter does not move, while a data track before audio jumps to 2 seconds before the actual start there is a seeming 2 seconds in which audio plays but counter does not move, while a data track before audio jumps to 2 seconds before the actual start
of the audio while audio still plays. With an absolute conversion, the counter is fine. */ of the audio while audio still plays. With an absolute conversion, the counter is fine. */
#define MSFtoLBA(m,s,f) ((((m * 60) + s) * 75) + f) #define MSFtoLBA(m,s,f) ((((m * 60) + s) * 75) + f)
static void static void
@@ -95,7 +93,7 @@ image_get_subchannel(cdrom_t *dev, uint32_t lba, subchannel_t *subc)
TMSF rel_pos, abs_pos; TMSF rel_pos, abs_pos;
cdi_get_audio_sub(img, lba, &subc->attr, &subc->track, &subc->index, cdi_get_audio_sub(img, lba, &subc->attr, &subc->track, &subc->index,
&rel_pos, &abs_pos); &rel_pos, &abs_pos);
subc->abs_m = abs_pos.min; subc->abs_m = abs_pos.min;
subc->abs_s = abs_pos.sec; subc->abs_s = abs_pos.sec;
@@ -117,14 +115,14 @@ image_get_capacity(cdrom_t *dev)
uint32_t address = 0, lb = 0; uint32_t address = 0, lb = 0;
if (!img) if (!img)
return 0; return 0;
cdi_get_audio_tracks_lba(img, &first_track, &last_track, &lb); cdi_get_audio_tracks_lba(img, &first_track, &last_track, &lb);
for (c = 0; c <= last_track; c++) { for (c = 0; c <= last_track; c++) {
cdi_get_audio_track_info_lba(img, 0, c + 1, &number, &address, &attr); cdi_get_audio_track_info_lba(img, 0, c + 1, &number, &address, &attr);
if (address > lb) if (address > lb)
lb = address; lb = address;
} }
return lb; return lb;
@@ -141,22 +139,22 @@ image_is_track_audio(cdrom_t *dev, uint32_t pos, int ismsf)
int number, track; int number, track;
if (!img || (dev->cd_status == CD_STATUS_DATA_ONLY)) if (!img || (dev->cd_status == CD_STATUS_DATA_ONLY))
return 0; return 0;
if (ismsf) { if (ismsf) {
m = (pos >> 16) & 0xff; m = (pos >> 16) & 0xff;
s = (pos >> 8) & 0xff; s = (pos >> 8) & 0xff;
f = pos & 0xff; f = pos & 0xff;
pos = MSFtoLBA(m, s, f) - 150; pos = MSFtoLBA(m, s, f) - 150;
} }
/* GetTrack requires LBA. */ /* GetTrack requires LBA. */
track = cdi_get_track(img, pos); track = cdi_get_track(img, pos);
if (track == -1) if (track == -1)
return 0; return 0;
else { else {
cdi_get_audio_track_info(img, 0, track, &number, &tmsf, &attr); cdi_get_audio_track_info(img, 0, track, &number, &tmsf, &attr);
return attr == AUDIO_TRACK; return attr == AUDIO_TRACK;
} }
} }
@@ -171,7 +169,7 @@ image_is_track_pre(cdrom_t *dev, uint32_t lba)
track = cdi_get_track(img, lba); track = cdi_get_track(img, lba);
if (track != -1) if (track != -1)
return cdi_get_audio_track_pre(img, track); return cdi_get_audio_track_pre(img, track);
return 0; return 0;
} }
@@ -192,18 +190,18 @@ image_read_sector(struct cdrom *dev, int type, uint8_t *b, uint32_t lba)
cd_img_t *img = (cd_img_t *)dev->image; cd_img_t *img = (cd_img_t *)dev->image;
switch (type) { switch (type) {
case CD_READ_DATA: case CD_READ_DATA:
return cdi_read_sector(img, b, 0, lba); return cdi_read_sector(img, b, 0, lba);
case CD_READ_AUDIO: case CD_READ_AUDIO:
return cdi_read_sector(img, b, 1, lba); return cdi_read_sector(img, b, 1, lba);
case CD_READ_RAW: case CD_READ_RAW:
if (cdi_get_sector_size(img, lba) == 2352) if (cdi_get_sector_size(img, lba) == 2352)
return cdi_read_sector(img, b, 1, lba); return cdi_read_sector(img, b, 1, lba);
else else
return cdi_read_sector_sub(img, b, lba); return cdi_read_sector_sub(img, b, lba);
default: default:
cdrom_image_log("CD-ROM %i: Unknown CD read type\n", dev->id); cdrom_image_log("CD-ROM %i: Unknown CD read type\n", dev->id);
return 0; return 0;
} }
} }
@@ -214,11 +212,11 @@ image_track_type(cdrom_t *dev, uint32_t lba)
cd_img_t *img = (cd_img_t *)dev->image; cd_img_t *img = (cd_img_t *)dev->image;
if (img) { if (img) {
if (image_is_track_audio(dev, lba, 0)) if (image_is_track_audio(dev, lba, 0))
return CD_TRACK_AUDIO; return CD_TRACK_AUDIO;
else { else {
if (cdi_is_mode2(img, lba)) if (cdi_is_mode2(img, lba))
return CD_TRACK_MODE2 | cdi_get_mode2_form(img, lba); return CD_TRACK_MODE2 | cdi_get_mode2_form(img, lba);
} }
} }
@@ -231,12 +229,12 @@ image_exit(cdrom_t *dev)
{ {
cd_img_t *img = (cd_img_t *)dev->image; cd_img_t *img = (cd_img_t *)dev->image;
cdrom_image_log("CDROM: image_exit(%s)\n", dev->image_path); cdrom_image_log("CDROM: image_exit(%s)\n", dev->image_path);
dev->cd_status = CD_STATUS_EMPTY; dev->cd_status = CD_STATUS_EMPTY;
if (img) { if (img) {
cdi_close(img); cdi_close(img);
dev->image = NULL; dev->image = NULL;
} }
dev->ops = NULL; dev->ops = NULL;
@@ -273,7 +271,7 @@ cdrom_image_open(cdrom_t *dev, const char *fn)
/* Make sure to not STRCPY if the two are pointing /* Make sure to not STRCPY if the two are pointing
at the same place. */ at the same place. */
if (fn != dev->image_path) if (fn != dev->image_path)
strcpy(dev->image_path, fn); strcpy(dev->image_path, fn);
/* Create new instance of the CDROM_Image class. */ /* Create new instance of the CDROM_Image class. */
img = (cd_img_t *) malloc(sizeof(cd_img_t)); img = (cd_img_t *) malloc(sizeof(cd_img_t));
@@ -281,14 +279,14 @@ cdrom_image_open(cdrom_t *dev, const char *fn)
/* This guarantees that if ops is not NULL, then /* This guarantees that if ops is not NULL, then
neither is the image pointer. */ neither is the image pointer. */
if (!img) if (!img)
return image_open_abort(dev); return image_open_abort(dev);
memset(img, 0, sizeof(cd_img_t)); memset(img, 0, sizeof(cd_img_t));
dev->image = img; dev->image = img;
/* Open the image. */ /* Open the image. */
if (!cdi_set_device(img, fn)) if (!cdi_set_device(img, fn))
return image_open_abort(dev); return image_open_abort(dev);
/* All good, reset state. */ /* All good, reset state. */
if (! strcasecmp(plat_get_extension((char *) fn), "ISO")) if (! strcasecmp(plat_get_extension((char *) fn), "ISO"))
@@ -313,5 +311,5 @@ cdrom_image_close(cdrom_t *dev)
cdrom_image_log("CDROM: image_close(%s)\n", dev->image_path); cdrom_image_log("CDROM: image_close(%s)\n", dev->image_path);
if (dev && dev->ops && dev->ops->exit) if (dev && dev->ops && dev->ops->exit)
dev->ops->exit(dev); dev->ops->exit(dev);
} }

687
src/cdrom/cdrom_image_backend.c
View File

File diff suppressed because it is too large Load Diff

56
src/include/86box/cdrom.h
View File

@@ -8,8 +8,6 @@
* *
* Generic CD-ROM drive core header. * Generic CD-ROM drive core header.
* *
*
*
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
* Copyright 2016-2019 Miran Grca. * Copyright 2016-2019 Miran Grca.
@@ -67,57 +65,57 @@ struct cdrom;
typedef struct { typedef struct {
uint8_t attr, track, uint8_t attr, track,
index, index,
abs_m, abs_s, abs_f, abs_m, abs_s, abs_f,
rel_m, rel_s, rel_f; rel_m, rel_s, rel_f;
} subchannel_t; } subchannel_t;
typedef struct { typedef struct {
int number; int number;
uint8_t attr, m, s, f; uint8_t attr, m, s, f;
} track_info_t; } track_info_t;
/* Define the various CD-ROM drive operations (ops). */ /* Define the various CD-ROM drive operations (ops). */
typedef struct { typedef struct {
void (*get_tracks)(struct cdrom *dev, int *first, int *last); void (*get_tracks)(struct cdrom *dev, int *first, int *last);
void (*get_track_info)(struct cdrom *dev, uint32_t track, int end, track_info_t *ti); void (*get_track_info)(struct cdrom *dev, uint32_t track, int end, track_info_t *ti);
void (*get_subchannel)(struct cdrom *dev, uint32_t lba, subchannel_t *subc); void (*get_subchannel)(struct cdrom *dev, uint32_t lba, subchannel_t *subc);
int (*is_track_pre)(struct cdrom *dev, uint32_t lba); int (*is_track_pre)(struct cdrom *dev, uint32_t lba);
int (*sector_size)(struct cdrom *dev, uint32_t lba); int (*sector_size)(struct cdrom *dev, uint32_t lba);
int (*read_sector)(struct cdrom *dev, int type, uint8_t *b, uint32_t lba); int (*read_sector)(struct cdrom *dev, int type, uint8_t *b, uint32_t lba);
int (*track_type)(struct cdrom *dev, uint32_t lba); int (*track_type)(struct cdrom *dev, uint32_t lba);
void (*exit)(struct cdrom *dev); void (*exit)(struct cdrom *dev);
} cdrom_ops_t; } cdrom_ops_t;
typedef struct cdrom { typedef struct cdrom {
uint8_t id; uint8_t id;
union { union {
uint8_t res, res0, /* Reserved for other ID's. */ uint8_t res, res0, /* Reserved for other ID's. */
res1, res1,
ide_channel, scsi_device_id; ide_channel, scsi_device_id;
}; };
uint8_t bus_type, /* 0 = ATAPI, 1 = SCSI */ uint8_t bus_type, /* 0 = ATAPI, 1 = SCSI */
bus_mode, /* Bit 0 = PIO suported; bus_mode, /* Bit 0 = PIO suported;
Bit 1 = DMA supportd. */ Bit 1 = DMA supportd. */
cd_status, /* Struct variable reserved for cd_status, /* Struct variable reserved for
media status. */ media status. */
speed, cur_speed; speed, cur_speed;
FILE* img_fp; FILE* img_fp;
void *priv; void *priv;
char image_path[1024], char image_path[1024],
prev_image_path[1024]; prev_image_path[1024];
uint32_t sound_on, cdrom_capacity, uint32_t sound_on, cdrom_capacity,
pad, seek_pos, pad, seek_pos,
seek_diff, cd_end; seek_diff, cd_end;
int host_drive, prev_host_drive, int host_drive, prev_host_drive,
cd_buflen, noplay; cd_buflen, noplay;
const cdrom_ops_t *ops; const cdrom_ops_t *ops;

21
src/include/86box/cdrom_image.h
View File

@@ -1,7 +1,20 @@
/* Copyright holders: RichardG867, Tenshi /*
see COPYING for more details * 86Box A hypervisor and IBM PC system emulator that specializes in
*/ * running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* CD-ROM image file handling module header, translated to C
* from cdrom_dosbox.h.
*
* Authors: RichardG,
* Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2016-2022 RichardG.
* Copyright 2016-2022 Miran Grca.
*/
#ifndef CDROM_IMAGE_H #ifndef CDROM_IMAGE_H
# define CDROM_IMAGE_H # define CDROM_IMAGE_H

72
src/include/86box/cdrom_image_backend.h
View File

@@ -9,8 +9,6 @@
* CD-ROM image file handling module header , translated to C * CD-ROM image file handling module header , translated to C
* from cdrom_dosbox.h. * from cdrom_dosbox.h.
* *
*
*
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* The DOSBox Team, <unknown> * The DOSBox Team, <unknown>
@@ -19,7 +17,6 @@
* Copyright 2017-2020 Fred N. van Kempen. * Copyright 2017-2020 Fred N. van Kempen.
* Copyright 2002-2020 The DOSBox Team. * Copyright 2002-2020 The DOSBox Team.
*/ */
#ifndef CDROM_IMAGE_BACKEND_H #ifndef CDROM_IMAGE_BACKEND_H
# define CDROM_IMAGE_BACKEND_H # define CDROM_IMAGE_BACKEND_H
@@ -42,56 +39,55 @@
typedef struct SMSF { typedef struct SMSF {
uint16_t min; uint16_t min;
uint8_t sec; uint8_t sec;
uint8_t fr; uint8_t fr;
} TMSF; } TMSF;
/* Track file struct. */ /* Track file struct. */
typedef struct { typedef struct {
int (*read)(void *p, uint8_t *buffer, uint64_t seek, size_t count); int (*read)(void *p, uint8_t *buffer, uint64_t seek, size_t count);
uint64_t (*get_length)(void *p); uint64_t (*get_length)(void *p);
void (*close)(void *p); void (*close)(void *p);
char fn[260]; char fn[260];
FILE *file; FILE *file;
} track_file_t; } track_file_t;
typedef struct { typedef struct {
int number, track_number, attr, sector_size, int number, track_number, attr, sector_size,
mode2, form, pre, pad; mode2, form, pre, pad;
uint64_t start, length, uint64_t start, length,
skip; skip;
track_file_t *file; track_file_t *file;
} track_t; } track_t;
typedef struct { typedef struct {
int tracks_num; int tracks_num;
track_t *tracks; track_t *tracks;
} cd_img_t; } cd_img_t;
/* Binary file functions. */ /* Binary file functions. */
extern void cdi_close(cd_img_t *cdi); extern void cdi_close(cd_img_t *cdi);
extern int cdi_set_device(cd_img_t *cdi, const char *path); extern int cdi_set_device(cd_img_t *cdi, const char *path);
extern int cdi_get_audio_tracks(cd_img_t *cdi, int *st_track, int *end, TMSF *lead_out); extern int cdi_get_audio_tracks(cd_img_t *cdi, int *st_track, int *end, TMSF *lead_out);
extern int cdi_get_audio_tracks_lba(cd_img_t *cdi, int *st_track, int *end, uint32_t *lead_out); extern int cdi_get_audio_tracks_lba(cd_img_t *cdi, int *st_track, int *end, uint32_t *lead_out);
extern int cdi_get_audio_track_pre(cd_img_t *cdi, int track); extern int cdi_get_audio_track_pre(cd_img_t *cdi, int track);
extern int cdi_get_audio_track_info(cd_img_t *cdi, int end, int track, int *track_num, TMSF *start, uint8_t *attr); extern int cdi_get_audio_track_info(cd_img_t *cdi, int end, int track, int *track_num, TMSF *start, uint8_t *attr);
extern int cdi_get_audio_track_info_lba(cd_img_t *cdi, int end, int track, int *track_num, uint32_t *start, uint8_t *attr); extern int cdi_get_audio_track_info_lba(cd_img_t *cdi, int end, int track, int *track_num, uint32_t *start, uint8_t *attr);
extern int cdi_get_track(cd_img_t *cdi, uint32_t sector); extern int cdi_get_track(cd_img_t *cdi, uint32_t sector);
extern int cdi_get_audio_sub(cd_img_t *cdi, uint32_t sector, uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos); extern int cdi_get_audio_sub(cd_img_t *cdi, uint32_t sector, uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos);
extern int cdi_read_sector(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector); extern int cdi_read_sector(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector);
extern int cdi_read_sectors(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector, uint32_t num); extern int cdi_read_sectors(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector, uint32_t num);
extern int cdi_read_sector_sub(cd_img_t *cdi, uint8_t *buffer, uint32_t sector); extern int cdi_read_sector_sub(cd_img_t *cdi, uint8_t *buffer, uint32_t sector);
extern int cdi_get_sector_size(cd_img_t *cdi, uint32_t sector); extern int cdi_get_sector_size(cd_img_t *cdi, uint32_t sector);
extern int cdi_is_mode2(cd_img_t *cdi, uint32_t sector); extern int cdi_is_mode2(cd_img_t *cdi, uint32_t sector);
extern int cdi_get_mode2_form(cd_img_t *cdi, uint32_t sector); extern int cdi_get_mode2_form(cd_img_t *cdi, uint32_t sector);
extern int cdi_load_iso(cd_img_t *cdi, const char *filename); extern int cdi_load_iso(cd_img_t *cdi, const char *filename);
extern int cdi_load_cue(cd_img_t *cdi, const char *cuefile); extern int cdi_load_cue(cd_img_t *cdi, const char *cuefile);
extern int cdi_has_data_track(cd_img_t *cdi); extern int cdi_has_data_track(cd_img_t *cdi);
extern int cdi_has_audio_track(cd_img_t *cdi); extern int cdi_has_audio_track(cd_img_t *cdi);
#endif /*CDROM_IMAGE_BACKEND_H*/ #endif /*CDROM_IMAGE_BACKEND_H*/