d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop USB mass storage devices support from ata(4). It is out of the build as

Browse Source 
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@
This commit is contained in:
Alexander Motin 2009-11-26 12:41:43 +00:00
parent b447e682d6
commit bcbe578a6a
6 changed files with 0 additions and 1150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/atacontrol/atacontrol.c
View File

@ -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;
}

1
sys/conf/files
View File

@ -533,7 +533,6 @@ dev/ata/chipsets/ata-sis.c optional ata pci | atasis
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

3
sys/dev/ata/ata-all.c
View File

@ -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";

1127
sys/dev/ata/ata-usb.c
View File

File diff suppressed because it is too large Load Diff

10
sys/modules/ata/atausb/Makefile
View File

@ -1,10 +0,0 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../../dev/ata
KMOD= atausb
SRCS= ata-usb.c
SRCS+= opt_bus.h opt_usb.h opt_ata.h usbdevs.h
SRCS+= ata_if.h device_if.h bus_if.h pci_if.h usb_if.h
.include <bsd.kmod.mk>

3
sys/sys/ata.h
View File

@ -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 */