svn commit: r199822 - in head: sbin/atacontrol sys/conf sys/dev/ata sys/modules/ata/atausb sys/sys

[Alexander Motin]

Author: mav
Date: Thu Nov 26 12:41:43 2009
New Revision: 199822
URL: http://svn.freebsd.org/changeset/base/199822

Log:
  Drop USB mass storage devices support from ata(4). It is out of the build as
  long as I remember, and completely superseded by better maintained umass(4).
  It's main idea was to optionally avoid CAM dependency for such devices, but
  with move ATA to CAM, it is not actual any more.
  
  No objections:	hselasky@, thompsa@, arch@

Deleted:
  head/sys/dev/ata/ata-usb.c
  head/sys/modules/ata/atausb/
Modified:
  head/sbin/atacontrol/atacontrol.c
  head/sys/conf/files
  head/sys/dev/ata/ata-all.c
  head/sys/sys/ata.h

Modified: head/sbin/atacontrol/atacontrol.c
==============================================================================
--- head/sbin/atacontrol/atacontrol.c	Thu Nov 26 08:49:46 2009	(r199821)
+++ head/sbin/atacontrol/atacontrol.c	Thu Nov 26 12:41:43 2009	(r199822)
@@ -61,9 +61,6 @@ mode2str(int mode)
 	case ATA_UDMA6: return "UDMA133";
 	case ATA_SA150: return "SATA150";
 	case ATA_SA300: return "SATA300";
-	case ATA_USB: return "USB";
-	case ATA_USB1: return "USB1";
-	case ATA_USB2: return "USB2";
 	case ATA_DMA: return "BIOSDMA";
 	default: return "???";
 	}
@@ -95,9 +92,6 @@ str2mode(char *str)
 	if (!strcasecmp(str, "UDMA133")) return ATA_UDMA6;
 	if (!strcasecmp(str, "SATA150")) return ATA_SA150;
 	if (!strcasecmp(str, "SATA300")) return ATA_SA300;
-	if (!strcasecmp(str, "USB")) return ATA_USB;
-	if (!strcasecmp(str, "USB1")) return ATA_USB1;
-	if (!strcasecmp(str, "USB2")) return ATA_USB2;
 	if (!strcasecmp(str, "BIOSDMA")) return ATA_DMA;
 	return -1;
 }

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu Nov 26 08:49:46 2009	(r199821)
+++ head/sys/conf/files	Thu Nov 26 12:41:43 2009	(r199822)
@@ -533,7 +533,6 @@ dev/ata/chipsets/ata-sis.c	optional ata 
 dev/ata/chipsets/ata-via.c	optional ata pci | atavia
 dev/ata/ata-disk.c		optional atadisk
 dev/ata/ata-raid.c		optional ataraid
-dev/ata/ata-usb.c		optional atausb usb
 dev/ata/atapi-cd.c		optional atapicd
 dev/ata/atapi-fd.c		optional atapifd
 dev/ata/atapi-tape.c		optional atapist

Modified: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c	Thu Nov 26 08:49:46 2009	(r199821)
+++ head/sys/dev/ata/ata-all.c	Thu Nov 26 12:41:43 2009	(r199822)
@@ -942,9 +942,6 @@ ata_mode2str(int mode)
     case ATA_UDMA6: return "UDMA133";
     case ATA_SA150: return "SATA150";
     case ATA_SA300: return "SATA300";
-    case ATA_USB: return "USB";
-    case ATA_USB1: return "USB1";
-    case ATA_USB2: return "USB2";
     default:
 	if (mode & ATA_DMA_MASK)
 	    return "BIOSDMA";

Modified: head/sys/sys/ata.h
==============================================================================
--- head/sys/sys/ata.h	Thu Nov 26 08:49:46 2009	(r199821)
+++ head/sys/sys/ata.h	Thu Nov 26 12:41:43 2009	(r199822)
@@ -278,9 +278,6 @@ struct ata_params {
 #define ATA_SA150               0x47
 #define ATA_SA300               0x48
 #define ATA_DMA_MAX             0x4f
-#define ATA_USB			0x80
-#define ATA_USB1		0x81
-#define ATA_USB2		0x82
 
 
 /* ATA commands */