d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calculate TOC size to match what scsi cd says.

Browse Source 
Exchange control<->addr_type fields
This commit is contained in:
Andrey A. Chernov 1996-02-02 20:50:04 +00:00
parent 3017478d1c
commit 4a52a30aff
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/mcd/mcd.c
View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.64 1996/02/01 16:51:53 ache Exp $
* $Id: mcd.c,v 1.65 1996/02/01 19:15:41 ache Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -1348,7 +1348,7 @@ mcd_toc_header(int unit, struct ioc_toc_header *th)
th->ending_track = bcd2bin(cd->volinfo.trk_high);
th->len = sizeof(struct ioc_toc_header) +
(th->ending_track - th->starting_track + 1) *
sizeof(struct cd_toc_entry);
sizeof(struct cd_toc_entry) + 6 /* ??? */;
return 0;
}

4
sys/dev/mcd/mcdreg.h
View File

@ -41,7 +41,7 @@
* the manufacturer or anyone else might provide better documentation,
* so this file (and the driver) will then have a better quality.
*
* $Id: mcdreg.h,v 1.9 1996/01/30 10:31:12 ache Exp $
* $Id: mcdreg.h,v 1.10 1996/02/01 17:19:46 ache Exp $
*/
#ifndef MCD_H
@ -178,8 +178,8 @@ struct mcd_volinfo {
};
struct mcd_qchninfo {
u_char control:4;
u_char addr_type:4;
u_char control:4;
u_char trk_no;
u_char idx_no;
bcd_t trk_size_msf[3];

4
sys/i386/isa/mcd.c
View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.64 1996/02/01 16:51:53 ache Exp $
* $Id: mcd.c,v 1.65 1996/02/01 19:15:41 ache Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -1348,7 +1348,7 @@ mcd_toc_header(int unit, struct ioc_toc_header *th)
th->ending_track = bcd2bin(cd->volinfo.trk_high);
th->len = sizeof(struct ioc_toc_header) +
(th->ending_track - th->starting_track + 1) *
sizeof(struct cd_toc_entry);
sizeof(struct cd_toc_entry) + 6 /* ??? */;
return 0;
}

4
sys/i386/isa/mcdreg.h
View File

@ -41,7 +41,7 @@
* the manufacturer or anyone else might provide better documentation,
* so this file (and the driver) will then have a better quality.
*
* $Id: mcdreg.h,v 1.9 1996/01/30 10:31:12 ache Exp $
* $Id: mcdreg.h,v 1.10 1996/02/01 17:19:46 ache Exp $
*/
#ifndef MCD_H
@ -178,8 +178,8 @@ struct mcd_volinfo {
};
struct mcd_qchninfo {
u_char control:4;
u_char addr_type:4;
u_char control:4;
u_char trk_no;
u_char idx_no;
bcd_t trk_size_msf[3];