From c8ef813271574760b0bf63b28d6264f12e00cc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 8 Sep 2009 20:29:10 +0000 Subject: [PATCH] ok, fix this one a better way, as suggested by Michael and Marcus. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33003 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/partitioning_systems/session/scsi-mmc.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/session/scsi-mmc.h b/src/add-ons/kernel/partitioning_systems/session/scsi-mmc.h index e2d694ca3e..a31cc3f1f7 100644 --- a/src/add-ons/kernel/partitioning_systems/session/scsi-mmc.h +++ b/src/add-ons/kernel/partitioning_systems/session/scsi-mmc.h @@ -107,15 +107,12 @@ make_msf_address(uint8 minutes, uint8 seconds, uint8 frames) */ static inline -uint32 +off_t msf_to_lba(msf_address msf) { - uint32 lba = (CDROM_FRAMES_PER_MINUTE * msf.minutes) + return (CDROM_FRAMES_PER_MINUTE * msf.minutes) + (CDROM_FRAMES_PER_SECOND * msf.seconds) - + msf.frames; - if (lba < 150) - return lba; - return (lba - 150); + + msf.frames - 150; } /*! \brief Header for data returned by all formats of SCSI