Commit bcb09c19 authored by Gerald Pfeifer's avatar Gerald Pfeifer Committed by Alexandre Julliard

The CDDA case of CDROM_RawRead() no longer works on FreeBSD -CURRENT,

remove it. Also, combine the FreeBSD and NetBSD NYI notes.
parent e63e39f2
...@@ -1350,10 +1350,8 @@ static NTSTATUS CDROM_RawRead(int dev, const RAW_READ_INFO* raw, void* buffer, D ...@@ -1350,10 +1350,8 @@ static NTSTATUS CDROM_RawRead(int dev, const RAW_READ_INFO* raw, void* buffer, D
return ret; return ret;
} }
} }
#elif defined(__FreeBSD__) #else
{ {
struct ioc_read_audio ira;
switch (raw->TrackMode) switch (raw->TrackMode)
{ {
case YellowMode2: case YellowMode2:
...@@ -1363,33 +1361,12 @@ static NTSTATUS CDROM_RawRead(int dev, const RAW_READ_INFO* raw, void* buffer, D ...@@ -1363,33 +1361,12 @@ static NTSTATUS CDROM_RawRead(int dev, const RAW_READ_INFO* raw, void* buffer, D
FIXME("XAForm2: NIY\n"); FIXME("XAForm2: NIY\n");
return ret; return ret;
case CDDA: case CDDA:
/* 2048 = 2 ** 11 */ FIXME("CDDA: NIY\n");
if (raw->DiskOffset.s.HighPart & ~2047) FIXME("Unsupported value\n");
ira.address.lba = ((raw->DiskOffset.s.LowPart >> 11) |
raw->DiskOffset.s.HighPart << (32 - 11)) - 1;
ira.address_format = CD_LBA_FORMAT;
ira.nframes = raw->SectorCount;
ira.buffer = buffer;
io = ioctl(cdrom_cache[dev].fd, CDIOCREADAUDIO, &ira);
break;
}
}
#elif defined(__NetBSD__)
{
switch (raw->TrackMode)
{
case YellowMode2:
FIXME("YellowMode2: NIY\n");
return ret;
case XAForm2:
FIXME("XAForm2: NIY\n");
return ret; return ret;
case CDDA: }
FIXME("CDDA: NIY\n");
return ret;
}
} }
#endif #endif
*sz = sectSize * raw->SectorCount; *sz = sectSize * raw->SectorCount;
ret = CDROM_GetStatusCode(io); ret = CDROM_GetStatusCode(io);
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment