Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36987 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-06-01 12:06:56 +00:00
parent 03768a4052
commit 8825d45d57
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp
View File

@ -128,7 +128,7 @@ get_toc(cd_driver_info *info, scsi_toc *toc)
status_t res; status_t res;
scsi_cmd_read_toc *cmd; scsi_cmd_read_toc *cmd;
size_t dataLength; size_t dataLength;
scsi_toc_general *short_response = (scsi_toc_general *)toc->toc_data; scsi_toc_general *shortResponse = (scsi_toc_general *)toc->toc_data;
TRACE("get_toc()\n"); TRACE("get_toc()\n");
@ -166,12 +166,12 @@ get_toc(cd_driver_info *info, scsi_toc *toc)
// but scsi_toc_toc has already one track, so we get // but scsi_toc_toc has already one track, so we get
// last - first extra tracks; finally, we want the lead-out as // last - first extra tracks; finally, we want the lead-out as
// well, so we add an extra track) // well, so we add an extra track)
dataLength = (short_response->last - short_response->first + 1) dataLength = (shortResponse->last - shortResponse->first + 1)
* sizeof(scsi_toc_track) + sizeof(scsi_toc_toc); * sizeof(scsi_toc_track) + sizeof(scsi_toc_toc);
dataLength = min_c(dataLength, sizeof(toc->toc_data)); dataLength = min_c(dataLength, sizeof(toc->toc_data));
TRACE(" tracks: %d - %d, data length %d\n", short_response->first, TRACE(" tracks: %d - %d, data length %d\n", shortResponse->first,
short_response->last, (int)dataLength); shortResponse->last, (int)dataLength);
cmd->allocation_length = B_HOST_TO_BENDIAN_INT16(dataLength); cmd->allocation_length = B_HOST_TO_BENDIAN_INT16(dataLength);