diff options
| author | ken <ken@FreeBSD.org> | 2001-01-28 21:43:17 +0000 |
|---|---|---|
| committer | ken <ken@FreeBSD.org> | 2001-01-28 21:43:17 +0000 |
| commit | 634f45c6d934e1ba85eb01223b12b7f7a3c38129 (patch) | |
| tree | babf5d65b7ed822571d0cc2a7be4efc566578cbe /sys/cam | |
| parent | 7d79d6d1ab73ef55677da1cd167d87ba5b17260b (diff) | |
| download | FreeBSD-src-634f45c6d934e1ba85eb01223b12b7f7a3c38129.zip FreeBSD-src-634f45c6d934e1ba85eb01223b12b7f7a3c38129.tar.gz | |
Fix region code reporting.
Reported by: Andrew Gordon <arg@arg1.demon.co.uk>
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/scsi/scsi_cd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index d140f9b..080da36 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -1,6 +1,6 @@ /* * Copyright (c) 1997 Justin T. Gibbs. - * Copyright (c) 1997, 1998, 1999, 2000 Kenneth D. Merry. + * Copyright (c) 1997, 1998, 1999, 2000, 2001 Kenneth D. Merry. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -3218,6 +3218,8 @@ cdreportkey(struct cam_periph *periph, struct dvd_authinfo *authinfo) (rpc_data->byte4 & RKD_RPC_VENDOR_RESET_MASK) >> RKD_RPC_VENDOR_RESET_SHIFT; authinfo->user_rsts = rpc_data->byte4 & RKD_RPC_USER_RESET_MASK; + authinfo->region = rpc_data->region_mask; + authinfo->rpc_scheme = rpc_data->rpc_scheme1; break; } case DVD_INVALIDATE_AGID: @@ -3297,9 +3299,6 @@ cdsendkey(struct cam_periph *periph, struct dvd_authinfo *authinfo) scsi_ulto2b(length - sizeof(rpc_data->data_len), rpc_data->data_len); - /* - * XXX KDM is this the right field from authinfo to use? - */ rpc_data->region_code = authinfo->region; break; } |
