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

Add LBA48_THRESHOLD #define and set it to the *correct* value. Use it 

in place of "0xffffff" (which is one too few 'f').
This commit is contained in:
matt 2003-07-10 23:23:44 +00:00
parent 7971e90f7e
commit 258cc62412
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ata/wd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wd.c,v 1.257 2003/06/29 22:30:06 fvdl Exp $ */ /* $NetBSD: wd.c,v 1.258 2003/07/10 23:23:44 matt Exp $ */
/* /*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.257 2003/06/29 22:30:06 fvdl Exp $"); __KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.258 2003/07/10 23:23:44 matt Exp $");
#ifndef WDCDEBUG #ifndef WDCDEBUG
#define WDCDEBUG #define WDCDEBUG
@ -107,6 +107,8 @@ __KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.257 2003/06/29 22:30:06 fvdl Exp $");
#include <sys/ataio.h> #include <sys/ataio.h>
#include "locators.h" #include "locators.h"
#define LBA48_THRESHOLD (0xfffffff) /* 128GB / DEV_BSIZE */
#define WDIORETRIES_SINGLE 4 /* number of retries before single-sector */ #define WDIORETRIES_SINGLE 4 /* number of retries before single-sector */
#define WDIORETRIES 5 /* number of retries before giving up */ #define WDIORETRIES 5 /* number of retries before giving up */
#define RECOVERYTIME hz/2 /* time to wait before retrying a cmd */ #define RECOVERYTIME hz/2 /* time to wait before retrying a cmd */
@ -711,7 +713,7 @@ __wdstart(wd, bp)
wd->sc_wdc_bio.flags = ATA_SINGLE; wd->sc_wdc_bio.flags = ATA_SINGLE;
else else
wd->sc_wdc_bio.flags = 0; wd->sc_wdc_bio.flags = 0;
if (wd->sc_flags & WDF_LBA48 && wd->sc_wdc_bio.blkno > 0xffffff) if (wd->sc_flags & WDF_LBA48 && wd->sc_wdc_bio.blkno > LBA48_THRESHOLD)
wd->sc_wdc_bio.flags |= ATA_LBA48; wd->sc_wdc_bio.flags |= ATA_LBA48;
if (wd->sc_flags & WDF_LBA) if (wd->sc_flags & WDF_LBA)
wd->sc_wdc_bio.flags |= ATA_LBA; wd->sc_wdc_bio.flags |= ATA_LBA;
@ -1543,7 +1545,7 @@ again:
wd->sc_wdc_bio.flags = ATA_POLL; wd->sc_wdc_bio.flags = ATA_POLL;
if (wddumpmulti == 1) if (wddumpmulti == 1)
wd->sc_wdc_bio.flags |= ATA_SINGLE; wd->sc_wdc_bio.flags |= ATA_SINGLE;
if (wd->sc_flags & WDF_LBA48 && blkno > 0xffffff) if (wd->sc_flags & WDF_LBA48 && blkno > LBA48_THRESHOLD)
wd->sc_wdc_bio.flags |= ATA_LBA48; wd->sc_wdc_bio.flags |= ATA_LBA48;
if (wd->sc_flags & WDF_LBA) if (wd->sc_flags & WDF_LBA)
wd->sc_wdc_bio.flags |= ATA_LBA; wd->sc_wdc_bio.flags |= ATA_LBA;