Date: Thu, 21 Feb 2019 09:54:11 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r344430 - in stable: 11/sys/conf 11/sys/dev/ata 12/sys/conf 12/sys/dev/ata Message-ID: <201902210954.x1L9sBvR012328@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avos Date: Thu Feb 21 09:54:10 2019 New Revision: 344430 URL: https://svnweb.freebsd.org/changeset/base/344430 Log: MFC r344198: GC ATA_REQUEST_TIMEOUT option remnants It was removed from code in r249083 and from sys/conf/options in r249213. PR: 193935, 222170 Modified: stable/12/sys/conf/NOTES stable/12/sys/dev/ata/ata-all.h Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/conf/NOTES stable/11/sys/dev/ata/ata-all.h Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/conf/NOTES ============================================================================== --- stable/12/sys/conf/NOTES Thu Feb 21 09:43:14 2019 (r344429) +++ stable/12/sys/conf/NOTES Thu Feb 21 09:54:10 2019 (r344430) @@ -1813,14 +1813,6 @@ hint.ata.1.port="0x170" hint.ata.1.irq="15" # -# The following options are valid on the ATA driver: -# -# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request -# before timing out. - -#options ATA_REQUEST_TIMEOUT=10 - -# # Standard floppy disk controllers and floppy tapes, supports # the Y-E DATA External FDD (PC Card) # Modified: stable/12/sys/dev/ata/ata-all.h ============================================================================== --- stable/12/sys/dev/ata/ata-all.h Thu Feb 21 09:43:14 2019 (r344429) +++ stable/12/sys/dev/ata/ata-all.h Thu Feb 21 09:54:10 2019 (r344430) @@ -203,10 +203,6 @@ #define ATA_OP_FINISHED 1 #define ATA_MAX_28BIT_LBA 268435455UL -#ifndef ATA_REQUEST_TIMEOUT -#define ATA_REQUEST_TIMEOUT 10 -#endif - /* structure used for composite atomic operations */ #define MAX_COMPOSITES 32 /* u_int32_t bits */ struct ata_composite {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902210954.x1L9sBvR012328>