]> git.proxmox.com Git - mirror_smartmontools-debian.git/blobdiff - os_freebsd.cpp
Fixed quietmode option
[mirror_smartmontools-debian.git] / os_freebsd.cpp
index 445238ee78830219677eb70925a03d0362008bf2..4df4b2d1f16dc6bd4aa085c730f09479a3f94ab7 100644 (file)
@@ -23,7 +23,6 @@
 #include <camlib.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
-#include <dev/usb/usb.h>
 #if defined(__DragonFly__)
 #include <sys/nata.h>
 #else
 #include "dev_ata_cmd_set.h"
 
 #define USBDEV "/dev/usb"
+#if defined(__FreeBSD_version)
 
-#define CONTROLLER_UNKNOWN              0x00
-#define CONTROLLER_ATA                  0x01
-#define CONTROLLER_SCSI                 0x02
-#define CONTROLLER_3WARE                0x03  // set by -d option, but converted to one of three types below
-#define CONTROLLER_3WARE_678K           0x04  // NOT set by guess_device_type()
-#define CONTROLLER_3WARE_9000_CHAR      0x05  // set by guess_device_type()
-#define CONTROLLER_3WARE_678K_CHAR      0x06  // set by guess_device_type()
-#define CONTROLLER_MARVELL_SATA         0x07  // SATA drives behind Marvell controllers
-#define CONTROLLER_SAT                         0x08  // SATA device behind a SCSI ATA Translation (SAT) layer
-#define CONTROLLER_HPT                  0x09  // SATA drives behind HighPoint Raid controllers
-#define CONTROLLER_CCISS               0x10  // CCISS controller 
-#define CONTROLLER_PARSEDEV             0x11  // "smartctl -r ataioctl,2 ..." output parser pseudo-device
-#define CONTROLLER_USBCYPRESS          0x12  // ATA device behind Cypress USB bridge
-#define CONTROLLER_ARECA                0x13  // Areca controller
-
-static __unused const char *filenameandversion="$Id: os_freebsd.cpp 2879 2009-08-29 17:19:00Z chrfranke $";
-
-const char *os_XXXX_c_cvsid="$Id: os_freebsd.cpp 2879 2009-08-29 17:19:00Z chrfranke $" \
-ATACMDS_H_CVSID CCISS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_FREEBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
+// This way we define one variable for the GNU/kFreeBSD and FreeBSD 
+#define FREEBSDVER __FreeBSD_version
+#else
+#define FREEBSDVER __FreeBSD_kernel_version
+#endif
 
-extern smartmonctrl * con;
+#if (FREEBSDVER >= 800000)
+#include <libusb20_desc.h>
+#include <libusb20.h>
+#else
+#include <dev/usb/usb.h>
+#include <dev/usb/usbhid.h>
+#endif
 
-// Private table of open devices: guaranteed zero on startup since
-// part of static data.
-struct freebsd_dev_channel *devicetable[FREEBSD_MAXDEV];
+#define CONTROLLER_3WARE_9000_CHAR      0x01
+#define CONTROLLER_3WARE_678K_CHAR      0x02
 
-// forward declaration
-// static int parse_ata_chan_dev(const char * dev_name, struct freebsd_dev_channel *ch);
+#ifndef PATHINQ_SETTINGS_SIZE
+#define PATHINQ_SETTINGS_SIZE   128
+#endif
 
+static __unused const char *filenameandversion="$Id: os_freebsd.cpp 2973 2009-10-26 22:38:19Z chrfranke $";
 
-// Returns 1 if device not available/open/found else 0.  Also shifts fd into valid range.
-static int isnotopen(int *fd, struct freebsd_dev_channel** fdchan) {
-  // put valid "file descriptor" into range 0...FREEBSD_MAXDEV-1
-  *fd -= FREEBSD_FDOFFSET;
-  
-  // check for validity of "file descriptor".
-  if (*fd<0 || *fd>=FREEBSD_MAXDEV || !((*fdchan)=devicetable[*fd])) {
-    errno = ENODEV;
-    return 1;
-  }
-  
-  return 0;
-}
+const char *os_XXXX_c_cvsid="$Id: os_freebsd.cpp 2973 2009-10-26 22:38:19Z chrfranke $" \
+ATACMDS_H_CVSID CCISS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_FREEBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
+
+extern smartmonctrl * con;
 
 #define NO_RETURN 0
 #define BAD_SMART 1
@@ -105,11 +89,11 @@ void printwarning(int msgNo, const char* extra) {
   static int printed[] = {0,0,0,0};
   static const char* message[]={
     "The SMART RETURN STATUS return value (smartmontools -H option/Directive)\n can not be retrieved with this version of ATAng, please do not rely on this value\nYou should update to at least 5.2\n",
-    
+
     "Error SMART Status command failed\nPlease get assistance from \n" PACKAGE_HOMEPAGE "\nRegister values returned from SMART Status command are:\n",
-    
+
     "You must specify a DISK # for 3ware drives with -d 3ware,<n> where <n> begins with 1 for first disk drive\n",
-    
+
     "ATA support is not provided for this kernel version. Please ugrade to a recent 5-CURRENT kernel (post 09/01/2003 or so)\n"
   };
 
@@ -124,59 +108,26 @@ void printwarning(int msgNo, const char* extra) {
   return;
 }
 
-
 // Interface to ATA devices behind 3ware escalade RAID controller cards.  See os_linux.c
 
 #define BUFFER_LEN_678K_CHAR ( sizeof(struct twe_usercommand) ) // 520
 #define BUFFER_LEN_9000_CHAR ( sizeof(TW_OSLI_IOCTL_NO_DATA_BUF) + sizeof(TWE_Command) ) // 2048
 #define TW_IOCTL_BUFFER_SIZE ( MAX(BUFFER_LEN_678K_CHAR, BUFFER_LEN_9000_CHAR) )
 
-
-
-
-
-
 #ifndef ATA_DEVICE
 #define ATA_DEVICE "/dev/ata"
 #endif
 
-
-
 // global variable holding byte count of allocated memory
 long long bytes;
 
-
-/*
- * dev_legacy.cpp
- *
- * Home page of code is: http://smartmontools.sourceforge.net
- *
- * Copyright (C) 2008 Christian Franke <smartmontools-support@lists.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-const char * dev_freebsd_cpp_cvsid = "$Id: os_freebsd.cpp 2879 2009-08-29 17:19:00Z chrfranke $"
+const char * dev_freebsd_cpp_cvsid = "$Id: os_freebsd.cpp 2973 2009-10-26 22:38:19Z chrfranke $"
   DEV_INTERFACE_H_CVSID;
 
 extern smartmonctrl * con; // con->reportscsiioctl
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_ATA_IDENTIFY_IS_CACHED
-int ata_identify_is_cached(int fd);
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
 namespace os_freebsd { // No need to publish anything, name provided for Doxygen
 
 /////////////////////////////////////////////////////////////////////////////
@@ -203,11 +154,22 @@ protected:
   int get_fd() const
     { return m_fd; }
 
+  void set_fd(int fd)
+    { m_fd = fd; }
+
 private:
   int m_fd; ///< filedesc, -1 if not open.
   const char * m_mode; ///< Mode string for deviceopen().
 };
 
+#ifdef __GLIBC__
+static inline void * reallocf(void *ptr, size_t size) {
+   void *rv = realloc(ptr, size);
+   if(rv == NULL)
+     free(ptr);
+   return rv;
+   }
+#endif
 
 freebsd_smart_device::~freebsd_smart_device() throw()
 {
@@ -221,7 +183,7 @@ unsigned char m_controller_port;
 
 // examples for smartctl
 static const char  smartctl_examples[] =
-       "=================================================== SMARTCTL EXAMPLES =====\n\n"
+   "=================================================== SMARTCTL EXAMPLES =====\n\n"
          "  smartctl -a /dev/ad0                       (Prints all SMART information)\n\n"
          "  smartctl --smart=on --offlineauto=on --saveauto=on /dev/ad0\n"
          "                                              (Enables SMART on first disk)\n\n"
@@ -233,6 +195,10 @@ static const char  smartctl_examples[] =
          "  smartctl -a --device=3ware,2 /dev/twe0\n"
          "                              (Prints all SMART information for ATA disk on\n"
          "                                 third port of first 3ware RAID controller)\n"
+  "  smartctl -a --device=cciss,0 /dev/ciss0\n"
+         "                              (Prints all SMART information for first disk \n"
+         "                               on Common Interface for SCSI-3 Support driver)\n"
+
          ;
 
 bool freebsd_smart_device::is_open() const
@@ -241,311 +207,11 @@ bool freebsd_smart_device::is_open() const
 }
 
 
-static int hpt_hba(const char* name) {
-  int i=0;
-  const char *hpt_node[]={"hptmv", "hptmv6", "hptrr", "hptiop", "hptmviop", "hpt32xx", "rr2320",
-                          "rr232x", "rr2310", "rr2310_00", "rr2300", "rr2340", "rr1740", NULL};
-  while (hpt_node[i]) {
-    if (!strncmp(name, hpt_node[i], strlen(hpt_node[i])))
-      return 1;
-    i++;
-  }
-  return 0;
-}
-
-static int get_tw_channel_unit (const char* name, int* unit, int* dev) {
-  const char *p;
-
-  /* device node sanity check */
-  for (p = name + 3; *p; p++)
-    if (*p < '0' || *p > '9')
-      return -1;
-  if (strlen(name) > 4 && *(name + 3) == '0')
-    return -1;
-
-  if (dev != NULL)
-    *dev=atoi(name + 3);
-
-  /* no need for unit number */
-  if (unit != NULL)
-    *unit=0;
-  return 0;
-}
-
-#ifndef IOCATAREQUEST
-static int get_ata_channel_unit ( const char* name, int* unit, int* dev) {
-#ifndef ATAREQUEST
-  *dev=0;
-  *unit=0;
-return 0;
-#else
-  // there is no direct correlation between name 'ad0, ad1, ...' and
-  // channel/unit number.  So we need to iterate through the possible
-  // channels and check each unit to see if we match names
-  struct ata_cmd iocmd;
-  int fd,maxunit;
-  
-  bzero(&iocmd, sizeof(struct ata_cmd));
-
-  if ((fd = open(ATA_DEVICE, O_RDWR)) < 0)
-    return -errno;
-  
-  iocmd.cmd = ATAGMAXCHANNEL;
-  if (ioctl(fd, IOCATA, &iocmd) < 0) {
-    return -errno;
-    close(fd);
-  }
-  maxunit = iocmd.u.maxchan;
-  for (*unit = 0; *unit < maxunit; (*unit)++) {
-    iocmd.channel = *unit;
-    iocmd.device = -1;
-    iocmd.cmd = ATAGPARM;
-    if (ioctl(fd, IOCATA, &iocmd) < 0) {
-      close(fd);
-      return -errno;
-    }
-    if (iocmd.u.param.type[0] && !strcmp(name,iocmd.u.param.name[0])) {
-      *dev = 0;
-      break;
-    }
-    if (iocmd.u.param.type[1] && !strcmp(name,iocmd.u.param.name[1])) {
-      *dev = 1;
-      break;
-    }
-  }
-  close(fd);
-  if (*unit == maxunit)
-    return -1;
-  else
-    return 0;
-#endif
-}
-#endif
-
-// Guess device type (ata or scsi) based on device name (FreeBSD
-// specific) SCSI device name in FreeBSD can be sd, sr, scd, st, nst,
-// osst, nosst and sg.
-static const char * fbsd_dev_prefix = _PATH_DEV;
-static const char * fbsd_dev_ata_disk_prefix = "ad";
-static const char * fbsd_dev_scsi_disk_plus = "da";
-static const char * fbsd_dev_scsi_pass = "pass";
-static const char * fbsd_dev_scsi_tape1 = "sa";
-static const char * fbsd_dev_scsi_tape2 = "nsa";
-static const char * fbsd_dev_scsi_tape3 = "esa";
-static const char * fbsd_dev_twe_ctrl = "twe";
-static const char * fbsd_dev_twa_ctrl = "twa";
-static const char * fbsd_dev_cciss = "ciss";
-
-int parse_ata_chan_dev(const char * dev_name, struct freebsd_dev_channel *chan) {
-  int len;
-  int dev_prefix_len = strlen(fbsd_dev_prefix);
-  
-  // if dev_name null, or string length zero
-  if (!dev_name || !(len = strlen(dev_name)))
-    return CONTROLLER_UNKNOWN;
-  
-  // Remove the leading /dev/... if it's there
-  if (!strncmp(fbsd_dev_prefix, dev_name, dev_prefix_len)) {
-    if (len <= dev_prefix_len) 
-      // if nothing else in the string, unrecognized
-      return CONTROLLER_UNKNOWN;
-    // else advance pointer to following characters
-    dev_name += dev_prefix_len;
-  }
-  // form /dev/ad* or ad*
-  if (!strncmp(fbsd_dev_ata_disk_prefix, dev_name,
-               strlen(fbsd_dev_ata_disk_prefix))) {
-#ifndef IOCATAREQUEST
-    if (chan != NULL) {
-      if (get_ata_channel_unit(dev_name,&(chan->channel),&(chan->device))<0) {
-        return CONTROLLER_UNKNOWN;
-      }
-    }
-#endif
-    return CONTROLLER_ATA;
-  }
-
-  // form /dev/pass* or pass*
-  if (!strncmp(fbsd_dev_scsi_pass, dev_name,
-               strlen(fbsd_dev_scsi_pass)))
-    goto handlescsi;
-
-  // form /dev/da* or da*
-  if (!strncmp(fbsd_dev_scsi_disk_plus, dev_name,
-               strlen(fbsd_dev_scsi_disk_plus)))
-    goto handlescsi;
-
-  // form /dev/sa* or sa*
-  if (!strncmp(fbsd_dev_scsi_tape1, dev_name,
-              strlen(fbsd_dev_scsi_tape1)))
-    goto handlescsi;
-
-  // form /dev/nsa* or nsa*
-  if (!strncmp(fbsd_dev_scsi_tape2, dev_name,
-              strlen(fbsd_dev_scsi_tape2)))
-    goto handlescsi;
-
-  // form /dev/esa* or esa*
-  if (!strncmp(fbsd_dev_scsi_tape3, dev_name,
-              strlen(fbsd_dev_scsi_tape3)))
-    goto handlescsi;
-  
-  if (!strncmp(fbsd_dev_twa_ctrl,dev_name,
-              strlen(fbsd_dev_twa_ctrl))) {
-    if (chan != NULL) {
-      if (get_tw_channel_unit(dev_name,&(chan->channel),&(chan->device))<0) {
-       return CONTROLLER_UNKNOWN;
-      }
-    }
-    else if (get_tw_channel_unit(dev_name,NULL,NULL)<0) {
-       return CONTROLLER_UNKNOWN;
-    }
-    return CONTROLLER_3WARE_9000_CHAR;
-  }
-
-  if (!strncmp(fbsd_dev_twe_ctrl,dev_name,
-              strlen(fbsd_dev_twe_ctrl))) {
-    if (chan != NULL) {
-      if (get_tw_channel_unit(dev_name,&(chan->channel),&(chan->device))<0) {
-       return CONTROLLER_UNKNOWN;
-      }
-    }
-    else if (get_tw_channel_unit(dev_name,NULL,NULL)<0) {
-       return CONTROLLER_UNKNOWN;
-    }
-    return CONTROLLER_3WARE_678K_CHAR;
-  }
-
-  if (hpt_hba(dev_name)) {
-    return CONTROLLER_HPT;
-  }
-
-  // form /dev/ciss*
-  if (!strncmp(fbsd_dev_cciss, dev_name,
-               strlen(fbsd_dev_cciss)))
-    return CONTROLLER_CCISS;
-
-  // we failed to recognize any of the forms
-  return CONTROLLER_UNKNOWN;
-
- handlescsi:
-  if (chan != NULL) {
-    if (!(chan->devname = (char *)calloc(1,DEV_IDLEN+1)))
-      return CONTROLLER_UNKNOWN;
-    
-    if (cam_get_device(dev_name,chan->devname,DEV_IDLEN,&(chan->unitnum)) == -1)
-      return CONTROLLER_UNKNOWN;
-  }
-  return CONTROLLER_SCSI;
-  
-}
-
-
 bool freebsd_smart_device::open()
 {
-       
   const char *dev = get_dev_name();
-  struct freebsd_dev_channel *fdchan;
-  int parse_ok, i;
-
-  // Search table for a free entry
-  for (i=0; i<FREEBSD_MAXDEV; i++)
-    if (!devicetable[i])
-      break;
-  
-  // If no free entry found, return error.  We have max allowed number
-  // of "file descriptors" already allocated.
-  if (i == FREEBSD_MAXDEV) {
-    errno = EMFILE;
-    return false;
-  }
-
-  fdchan = (struct freebsd_dev_channel *)calloc(1,sizeof(struct freebsd_dev_channel));
-  if (fdchan == NULL) {
-    // errno already set by call to malloc()
-    return false;
-  }
-
-  parse_ok = parse_ata_chan_dev(dev,fdchan);
-  
-  if (parse_ok == CONTROLLER_UNKNOWN) {
-    free(fdchan);
-    errno = ENOTTY;
-    return false; // can't handle what we don't know
-  }
-
-  if (parse_ok == CONTROLLER_ATA) {
-#ifdef IOCATAREQUEST
-    if ((fdchan->device = ::open(dev,O_RDONLY))<0) {
-#else
-    if ((fdchan->atacommand = ::open("/dev/ata",O_RDWR))<0) {
-#endif
-      int myerror = errno;     // preserve across free call
-      free(fdchan);
-      errno = myerror;
-      return false;
-    }
-  }
-
-  if (parse_ok == CONTROLLER_3WARE_678K_CHAR) {
-    char buf[512];
-    sprintf(buf,"/dev/twe%d",fdchan->device);
-#ifdef IOCATAREQUEST
-    if ((fdchan->device = ::open(buf,O_RDWR))<0) {
-#else
-    if ((fdchan->atacommand = ::open(buf,O_RDWR))<0) {
-#endif
-      int myerror = errno;     // preserve across free call
-      free(fdchan);
-      errno = myerror;
-      return false;
-    }
-  }
-
-  if (parse_ok == CONTROLLER_3WARE_9000_CHAR) {
-    char buf[512];
-    sprintf(buf,"/dev/twa%d",fdchan->device);
-#ifdef IOCATAREQUEST
-    if ((fdchan->device = ::open(buf,O_RDWR))<0) {
-#else
-    if ((fdchan->atacommand = ::open(buf,O_RDWR))<0) {
-#endif
-      int myerror = errno;     // preserve across free call
-      free(fdchan);
-      errno = myerror;
-      return false;
-    }
-  }
-
-  if (parse_ok == CONTROLLER_HPT) {
-    if ((fdchan->device = ::open(dev,O_RDWR))<0) {
-      int myerror = errno;     // preserve across free call
-      free(fdchan);
-      errno = myerror;
-      return false;
-    }
-  }
-
-  if (parse_ok == CONTROLLER_CCISS) {
-    if ((fdchan->device = ::open(dev,O_RDWR))<0) {
-      int myerror = errno;     // preserve across free call
-      free(fdchan);
-      errno = myerror;
-      return false;
-    }
-  }
-
-  if (parse_ok == CONTROLLER_SCSI) {
-    // this is really a NO-OP, as the parse takes care
-    // of filling in correct details
-  }
-  
-  // return pointer to "file descriptor" table entry, properly offset.
-  devicetable[i]=fdchan;
-  m_fd = i+FREEBSD_FDOFFSET;
-  // endofold
-  if (m_fd < 0) {
-    set_err((errno==ENOENT || errno==ENOTDIR) ? ENODEV : errno);
+  if ((m_fd = ::open(dev,O_RDONLY))<0) {
+    set_err(errno);
     return false;
   }
   return true;
@@ -553,36 +219,15 @@ bool freebsd_smart_device::open()
 
 bool freebsd_smart_device::close()
 {
-  int fd = m_fd; m_fd = -1;
-  struct freebsd_dev_channel *fdchan;
   int failed = 0;
+  // close device, if open
+  if (is_open())
+    failed=::close(get_fd());
 
-  // check for valid file descriptor
-  if (isnotopen(&fd, &fdchan))
-    return false;
-  
+  set_fd(-1);
 
-  // did we allocate a SCSI device name?
-  if (fdchan->devname)
-    free(fdchan->devname);
-  
-  // close device, if open
-  if (fdchan->device)
-    failed=::close(fdchan->device);
-#ifndef IOCATAREQUEST
-  if (fdchan->atacommand)
-    failed=::close(fdchan->atacommand);
-#endif
-  
-  // if close succeeded, then remove from device list
-  // Eduard, should we also remove it from list if close() fails?  I'm
-  // not sure. Here I only remove it from list if close() worked.
-  if (!failed) {
-    free(fdchan);
-    devicetable[fd]=NULL;
-  }
-  
-  return failed;
+  if(failed) return false;
+    else return true;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -595,12 +240,9 @@ class freebsd_ata_device
 public:
   freebsd_ata_device(smart_interface * intf, const char * dev_name, const char * req_type);
 
-#ifdef HAVE_ATA_IDENTIFY_IS_CACHED
-  virtual bool ata_identify_is_cached() const;
-#endif
-
 protected:
   virtual int ata_command_interface(smart_command_set command, int select, char * data);
+  virtual int do_cmd(struct ata_ioc_request* request);
 };
 
 freebsd_ata_device::freebsd_ata_device(smart_interface * intf, const char * dev_name, const char * req_type)
@@ -609,212 +251,257 @@ freebsd_ata_device::freebsd_ata_device(smart_interface * intf, const char * dev_
 {
 }
 
-int freebsd_ata_device::ata_command_interface(smart_command_set command, int select, char * data)
+int freebsd_ata_device::do_cmd( struct ata_ioc_request* request)
 {
-       int fd=get_fd();
-       #if !defined(ATAREQUEST) && !defined(IOCATAREQUEST)
-       // sorry, but without ATAng, we can't do anything here
-       printwarning(BAD_KERNEL,NULL);
-       errno = ENOSYS;
-       return -1;
-       #else
-       struct freebsd_dev_channel* con;
-       int retval, copydata=0;
-       #ifdef IOCATAREQUEST
-       struct ata_ioc_request request;
-       #else
-       struct ata_cmd iocmd;
-       #endif
-       unsigned char buff[512];
-       
-       // check that "file descriptor" is valid
-       if (isnotopen(&fd,&con))
-               return -1;
-       
-       bzero(buff,512);
-       
-       #ifdef IOCATAREQUEST
-       bzero(&request,sizeof(struct ata_ioc_request));
-       #else
-       bzero(&iocmd,sizeof(struct ata_cmd));
-       #endif
-       bzero(buff,512);
-       
-       #ifndef IOCATAREQUEST
-       iocmd.cmd=ATAREQUEST;
-       iocmd.channel=con->channel;
-       iocmd.device=con->device;
-       #define request iocmd.u.request
-       #endif
-       
-       request.u.ata.command=ATA_SMART_CMD;
-       request.timeout=600;
-       switch (command){
-       case READ_VALUES:
-               request.u.ata.feature=ATA_SMART_READ_VALUES;
-               request.u.ata.lba=0xc24f<<8;
-               request.flags=ATA_CMD_READ;
-               request.data=(char *)buff;
-               request.count=512;
-               copydata=1;
-               break;
-       case READ_THRESHOLDS:
-               request.u.ata.feature=ATA_SMART_READ_THRESHOLDS;
-               request.u.ata.count=1;
-               request.u.ata.lba=1|(0xc24f<<8);
-               request.flags=ATA_CMD_READ;
-               request.data=(char *)buff;
-               request.count=512;
-               copydata=1;
-               break;
-       case READ_LOG:
-               request.u.ata.feature=ATA_SMART_READ_LOG_SECTOR;
-               request.u.ata.lba=select|(0xc24f<<8);
-               request.u.ata.count=1;
-               request.flags=ATA_CMD_READ;
-               request.data=(char *)buff;
-               request.count=512;
-               copydata=1;
-               break;
-       case IDENTIFY:
-               request.u.ata.command=ATA_IDENTIFY_DEVICE;
-               request.flags=ATA_CMD_READ;
-               request.data=(char *)buff;
-               request.count=512;
-               copydata=1;
-               break;
-       case PIDENTIFY:
-               request.u.ata.command=ATA_IDENTIFY_PACKET_DEVICE;
-               request.flags=ATA_CMD_READ;
-               request.data=(char *)buff;
-               request.count=512;
-               copydata=1;
-               break;
-       case ENABLE:
-               request.u.ata.feature=ATA_SMART_ENABLE;
-               request.u.ata.lba=0xc24f<<8;
-               request.flags=ATA_CMD_CONTROL;
-               break;
-       case DISABLE:
-               request.u.ata.feature=ATA_SMART_DISABLE;
-               request.u.ata.lba=0xc24f<<8;
-               request.flags=ATA_CMD_CONTROL;
-               break;
-       case AUTO_OFFLINE:
-               // NOTE: According to ATAPI 4 and UP, this command is obsolete
-               request.u.ata.feature=ATA_SMART_AUTO_OFFLINE;
-               request.u.ata.lba=0xc24f<<8;                                                                                                                                         
-               request.u.ata.count=select;                                                                                                                                          
-               request.flags=ATA_CMD_CONTROL;
-               break;
-       case AUTOSAVE:
-               request.u.ata.feature=ATA_SMART_AUTOSAVE;
-               request.u.ata.lba=0xc24f<<8;
-               request.u.ata.count=select;
-               request.flags=ATA_CMD_CONTROL;
-               break;
-       case IMMEDIATE_OFFLINE:
-               request.u.ata.feature=ATA_SMART_IMMEDIATE_OFFLINE;
-               request.u.ata.lba = select|(0xc24f<<8); // put test in sector
-               request.flags=ATA_CMD_CONTROL;
-               break;
-       case STATUS_CHECK: // same command, no HDIO in FreeBSD
-       case STATUS:
-               // this command only says if SMART is working.  It could be
-               // replaced with STATUS_CHECK below.
-               request.u.ata.feature=ATA_SMART_STATUS;
-               request.u.ata.lba=0xc24f<<8;
-               request.flags=ATA_CMD_CONTROL;
-               break;
-       case CHECK_POWER_MODE:
-               request.u.ata.command=ATA_CHECK_POWER_MODE;
-               request.u.ata.feature=0;
-               request.flags=ATA_CMD_CONTROL;
-               break;
-       case WRITE_LOG:
-               memcpy(buff, data, 512);
-               request.u.ata.feature=ATA_SMART_WRITE_LOG_SECTOR;
-               request.u.ata.lba=select|(0xc24f<<8);
-               request.u.ata.count=1;
-               request.flags=ATA_CMD_WRITE;
-               request.data=(char *)buff;
-               request.count=512;
-               break;
-       default:
-               pout("Unrecognized command %d in ata_command_interface()\n"
-                       "Please contact " PACKAGE_BUGREPORT "\n", command);
-               errno=ENOSYS;
-               return -1;
-       }
-       
-       if (command==STATUS_CHECK){
-               unsigned const char normal_lo=0x4f, normal_hi=0xc2;
-               unsigned const char failed_lo=0xf4, failed_hi=0x2c;
-               unsigned char low,high;
-               
-               #ifdef IOCATAREQUEST
-               if ((retval=ioctl(con->device, IOCATAREQUEST, &request)) || request.error)
-                       #else
-               if ((retval=ioctl(con->atacommand, IOCATA, &iocmd)) || request.error)
-                       #endif
-               return -1;
-               
-               #if __FreeBSD_version < 502000
-               printwarning(NO_RETURN,NULL);
-               #endif
-               
-               high = (request.u.ata.lba >> 16) & 0xff;
-               low = (request.u.ata.lba >> 8) & 0xff;
-               
-               // Cyl low and Cyl high unchanged means "Good SMART status"
-               if (low==normal_lo && high==normal_hi)
-                       return 0;
-               
-               // These values mean "Bad SMART status"
-               if (low==failed_lo && high==failed_hi)
-                       return 1;
-               
-               // We haven't gotten output that makes sense; print out some debugging info
-               char buf[512];
-               sprintf(buf,"CMD=0x%02x\nFR =0x%02x\nNS =0x%02x\nSC =0x%02x\nCL =0x%02x\nCH =0x%02x\nRETURN =0x%04x\n",
-                       (int)request.u.ata.command,
-                       (int)request.u.ata.feature,
-                       (int)request.u.ata.count,
-                       (int)((request.u.ata.lba) & 0xff),
-                       (int)((request.u.ata.lba>>8) & 0xff),
-                       (int)((request.u.ata.lba>>16) & 0xff),
-                       (int)request.error);
-               printwarning(BAD_SMART,buf);
-               return 0;   
-       }
-       
-       #ifdef IOCATAREQUEST
-       if ((retval=ioctl(con->device, IOCATAREQUEST, &request)) || request.error)
-               #else
-       if ((retval=ioctl(con->atacommand, IOCATA, &iocmd)) || request.error)
-               #endif
-       {
-               return -1;
-       }
-       // 
-       if (command == CHECK_POWER_MODE) {
-               data[0] = request.u.ata.count & 0xff;
-               return 0;
-       }
-       if (copydata)
-               memcpy(data, buff, 512);
-       
-       return 0;
-       #endif
+  int fd = get_fd();
+  return ioctl(fd, IOCATAREQUEST, request);
 }
 
-#ifdef HAVE_ATA_IDENTIFY_IS_CACHED
-bool freebsd_ata_device::ata_identify_is_cached() const
+#if FREEBSDVER > 800100
+class freebsd_atacam_device : public freebsd_ata_device
 {
-  return !!::ata_identify_is_cached(get_fd());
+public:
+  freebsd_atacam_device(smart_interface * intf, const char * dev_name, const char * req_type)
+  : smart_device(intf, dev_name, "atacam", req_type), freebsd_ata_device(intf, dev_name, req_type)
+  {}
+  
+  virtual bool open();
+  virtual bool close();
+  
+protected:
+  int m_fd;
+  struct cam_device *m_camdev;
+
+  virtual int do_cmd( struct ata_ioc_request* request);
+};
+
+bool freebsd_atacam_device::open(){
+  const char *dev = get_dev_name();
+  
+  if ((m_camdev = cam_open_device(dev, O_RDWR)) == NULL) {
+    set_err(errno);
+    return false;
+  }
+  set_fd(m_camdev->fd);
+  return true;
 }
+
+bool freebsd_atacam_device::close(){
+  cam_close_device(m_camdev);
+  set_fd(-1);
+  return true;
+}
+
+int freebsd_atacam_device::do_cmd( struct ata_ioc_request* request)
+{
+  union ccb ccb;
+  int camflags;
+
+  memset(&ccb, 0, sizeof(ccb));
+
+  if (request->count == 0)
+    camflags = CAM_DIR_NONE;
+  else if (request->flags == ATA_CMD_READ)
+    camflags = CAM_DIR_IN;
+  else
+    camflags = CAM_DIR_OUT;
+
+  cam_fill_ataio(&ccb.ataio,
+                 0,
+                 NULL,
+                 camflags,
+                 MSG_SIMPLE_Q_TAG,
+                 (u_int8_t*)request->data,
+                 request->count,
+                 request->timeout * 1000); // timeout in seconds
+
+  // ata_28bit_cmd
+  ccb.ataio.cmd.flags = 0;
+  ccb.ataio.cmd.command = request->u.ata.command;
+  ccb.ataio.cmd.features = request->u.ata.feature;
+  ccb.ataio.cmd.lba_low = request->u.ata.lba;
+  ccb.ataio.cmd.lba_mid = request->u.ata.lba >> 8;
+  ccb.ataio.cmd.lba_high = request->u.ata.lba >> 16;
+  ccb.ataio.cmd.device = 0x40 | ((request->u.ata.lba >> 24) & 0x0f);
+  ccb.ataio.cmd.sector_count = request->u.ata.count;
+
+  ccb.ccb_h.flags |= CAM_DEV_QFRZDIS;
+
+  if (cam_send_ccb(m_camdev, &ccb) < 0) {
+    err(1, "cam_send_ccb");
+    return -1;
+  }
+
+  if ((ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP)
+    return 0;
+
+  cam_error_print(m_camdev, &ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr);
+  return -1;
+}
+
+#endif
+
+int freebsd_ata_device::ata_command_interface(smart_command_set command, int select, char * data)
+{
+ int retval, copydata=0;
+ struct ata_ioc_request request;
+ unsigned char buff[512];
+
+ bzero(buff,512);
+ bzero(&request,sizeof(struct ata_ioc_request));
+ bzero(buff,512);
+
+ request.u.ata.command=ATA_SMART_CMD;
+ request.timeout=SCSI_TIMEOUT_DEFAULT;
+ switch (command){
+ case READ_VALUES:
+  request.u.ata.feature=ATA_SMART_READ_VALUES;
+  request.u.ata.lba=0xc24f<<8;
+  request.flags=ATA_CMD_READ;
+  request.data=(char *)buff;
+  request.count=512;
+  copydata=1;
+  break;
+ case READ_THRESHOLDS:
+  request.u.ata.feature=ATA_SMART_READ_THRESHOLDS;
+  request.u.ata.count=1;
+  request.u.ata.lba=1|(0xc24f<<8);
+  request.flags=ATA_CMD_READ;
+  request.data=(char *)buff;
+  request.count=512;
+  copydata=1;
+  break;
+ case READ_LOG:
+  request.u.ata.feature=ATA_SMART_READ_LOG_SECTOR;
+  request.u.ata.lba=select|(0xc24f<<8);
+  request.u.ata.count=1;
+  request.flags=ATA_CMD_READ;
+  request.data=(char *)buff;
+  request.count=512;
+  copydata=1;
+  break;
+ case IDENTIFY:
+  request.u.ata.command=ATA_IDENTIFY_DEVICE;
+  request.flags=ATA_CMD_READ;
+  request.data=(char *)buff;
+  request.count=512;
+  copydata=1;
+  break;
+ case PIDENTIFY:
+  request.u.ata.command=ATA_IDENTIFY_PACKET_DEVICE;
+  request.flags=ATA_CMD_READ;
+  request.data=(char *)buff;
+  request.count=512;
+  copydata=1;
+  break;
+ case ENABLE:
+  request.u.ata.feature=ATA_SMART_ENABLE;
+  request.u.ata.lba=0xc24f<<8;
+  request.flags=ATA_CMD_CONTROL;
+  break;
+ case DISABLE:
+  request.u.ata.feature=ATA_SMART_DISABLE;
+  request.u.ata.lba=0xc24f<<8;
+  request.flags=ATA_CMD_CONTROL;
+  break;
+ case AUTO_OFFLINE:
+  // NOTE: According to ATAPI 4 and UP, this command is obsolete
+  request.u.ata.feature=ATA_SMART_AUTO_OFFLINE;
+  request.u.ata.lba=0xc24f<<8;                                                                                                                                         
+  request.u.ata.count=select;                                                                                                                                          
+  request.flags=ATA_CMD_CONTROL;
+  break;
+ case AUTOSAVE:
+  request.u.ata.feature=ATA_SMART_AUTOSAVE;
+  request.u.ata.lba=0xc24f<<8;
+  request.u.ata.count=select;
+  request.flags=ATA_CMD_CONTROL;
+  break;
+ case IMMEDIATE_OFFLINE:
+  request.u.ata.feature=ATA_SMART_IMMEDIATE_OFFLINE;
+  request.u.ata.lba = select|(0xc24f<<8); // put test in sector
+  request.flags=ATA_CMD_CONTROL;
+  break;
+ case STATUS_CHECK: // same command, no HDIO in FreeBSD
+ case STATUS:
+  // this command only says if SMART is working.  It could be
+  // replaced with STATUS_CHECK below.
+  request.u.ata.feature=ATA_SMART_STATUS;
+  request.u.ata.lba=0xc24f<<8;
+  request.flags=ATA_CMD_CONTROL;
+  break;
+ case CHECK_POWER_MODE:
+  request.u.ata.command=ATA_CHECK_POWER_MODE;
+  request.u.ata.feature=0;
+  request.flags=ATA_CMD_CONTROL;
+  break;
+ case WRITE_LOG:
+  memcpy(buff, data, 512);
+  request.u.ata.feature=ATA_SMART_WRITE_LOG_SECTOR;
+  request.u.ata.lba=select|(0xc24f<<8);
+  request.u.ata.count=1;
+  request.flags=ATA_CMD_WRITE;
+  request.data=(char *)buff;
+  request.count=512;
+  break;
+ default:
+  pout("Unrecognized command %d in ata_command_interface()\n"
+   "Please contact " PACKAGE_BUGREPORT "\n", command);
+  errno=ENOSYS;
+  return -1;
+ }
+
+ if (command==STATUS_CHECK){
+  unsigned const char normal_lo=0x4f, normal_hi=0xc2;
+  unsigned const char failed_lo=0xf4, failed_hi=0x2c;
+  unsigned char low,high;
+
+  if ((retval=do_cmd(&request)) || request.error)
+  return -1;
+
+#if (FREEBSDVER < 502000)
+  printwarning(NO_RETURN,NULL);
 #endif
 
+  high = (request.u.ata.lba >> 16) & 0xff;
+  low = (request.u.ata.lba >> 8) & 0xff;
+
+  // Cyl low and Cyl high unchanged means "Good SMART status"
+  if (low==normal_lo && high==normal_hi)
+   return 0;
+
+  // These values mean "Bad SMART status"
+  if (low==failed_lo && high==failed_hi)
+   return 1;
+
+  // We haven't gotten output that makes sense; print out some debugging info
+  char buf[512];
+  sprintf(buf,"CMD=0x%02x\nFR =0x%02x\nNS =0x%02x\nSC =0x%02x\nCL =0x%02x\nCH =0x%02x\nRETURN =0x%04x\n",
+   (int)request.u.ata.command,
+   (int)request.u.ata.feature,
+   (int)request.u.ata.count,
+   (int)((request.u.ata.lba) & 0xff),
+   (int)((request.u.ata.lba>>8) & 0xff),
+   (int)((request.u.ata.lba>>16) & 0xff),
+   (int)request.error);
+  printwarning(BAD_SMART,buf);
+  return 0;   
+ }
+
+ if ((retval=do_cmd(&request)) || request.error)
+ {
+  return -1;
+ }
+ // 
+ if (command == CHECK_POWER_MODE) {
+  data[0] = request.u.ata.count & 0xff;
+  return 0;
+ }
+ if (copydata)
+  memcpy(data, buff, 512);
+
+  return 0;
+}
 
 /////////////////////////////////////////////////////////////////////////////
 /// Implement AMCC/3ware RAID support with old functions
@@ -829,6 +516,7 @@ public:
 
 protected:
   virtual int ata_command_interface(smart_command_set command, int select, char * data);
+  virtual bool open();
 
 private:
   int m_escalade_type; ///< Type string for escalade_command_interface().
@@ -847,11 +535,23 @@ freebsd_escalade_device::freebsd_escalade_device(smart_interface * intf, const c
   set_info().info_name = strprintf("%s [3ware_disk_%02d]", dev_name, disknum);
 }
 
+bool freebsd_escalade_device::open()
+{
+  const char *dev = get_dev_name();
+  int fd;
+  
+  if ((fd = ::open(dev,O_RDWR))<0) {
+    set_err(errno);
+    return false;
+  }
+  set_fd(fd);
+  return true;
+}
+
 int freebsd_escalade_device::ata_command_interface(smart_command_set command, int select, char * data)
 {
-    // to hold true file descriptor
-    int fd = get_fd();
-  struct freebsd_dev_channel* con;
+  // to hold true file descriptor
+  int fd = get_fd();
 
   // return value and buffer for ioctl()
   int  ioctlreturn, readdata=0;
@@ -867,10 +567,6 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
     return -1;
   }
 
-  // check that "file descriptor" is valid
-  if (isnotopen(&fd,&con))
-      return -1;
-
   memset(ioctl_buffer, 0, TW_IOCTL_BUFFER_SIZE);
 
   if (m_escalade_type==CONTROLLER_3WARE_9000_CHAR) {
@@ -883,7 +579,7 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
     ata = &cmd_twe->tu_command.ata;
   } else {
     pout("Unrecognized escalade_type %d in freebsd_3ware_command_interface(disk %d)\n"
-         "Please contact " PACKAGE_BUGREPORT "\n", m_escalade_type, m_disknum);
+      "Please contact " PACKAGE_BUGREPORT "\n", m_escalade_type, m_disknum);
     errno=ENOSYS;
     return -1;
   }
@@ -902,10 +598,10 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
   // values from the ATA specifications.
   ata->cylinder_lo   = 0x4F;
   ata->cylinder_hi   = 0xC2;
-  
+
   // SMART ATA COMMAND REGISTER value
   ata->command       = ATA_SMART_CMD;
-  
+
   // Is this a command that reads or returns 512 bytes?
   // passthru->param values are:
   // 0x0 - non data command without TFR write check,
@@ -917,7 +613,8 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
       command == READ_THRESHOLDS ||
       command == READ_LOG        ||
       command == IDENTIFY        ||
-      command == WRITE_LOG ) {
+      command == WRITE_LOG ) 
+  {
     readdata=1;
     if (m_escalade_type==CONTROLLER_3WARE_678K_CHAR) {
       cmd_twe->tu_data = data;
@@ -942,7 +639,7 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
     ata->param        = 0x8;
     ata->sector_count = 0x0;
   }
-  
+
   // Now set ATA registers depending upon command
   switch (command){
   case CHECK_POWER_MODE:
@@ -1020,17 +717,9 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
 
   // Now send the command down through an ioctl()
   if (m_escalade_type==CONTROLLER_3WARE_9000_CHAR) {
-#ifdef IOCATAREQUEST
-    ioctlreturn=ioctl(con->device,TW_OSL_IOCTL_FIRMWARE_PASS_THROUGH,cmd_twa);
-#else
-    ioctlreturn=ioctl(con->atacommand,TW_OSL_IOCTL_FIRMWARE_PASS_THROUGH,cmd_twa);
-#endif
+    ioctlreturn=ioctl(fd,TW_OSL_IOCTL_FIRMWARE_PASS_THROUGH,cmd_twa);
   } else {
-#ifdef IOCATAREQUEST
-    ioctlreturn=ioctl(con->device,TWEIO_COMMAND,cmd_twe);
-#else
-    ioctlreturn=ioctl(con->atacommand,TWEIO_COMMAND,cmd_twe);
-#endif
+    ioctlreturn=ioctl(fd,TWEIO_COMMAND,cmd_twe);
   }
 
   // Deal with the different error cases
@@ -1039,7 +728,7 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
       errno=EIO;
     return -1;
   }
-  
+
   // See if the ATA command failed.  Now that we have returned from
   // the ioctl() call, if passthru is valid, then:
   // - ata->status contains the 3ware controller STATUS
@@ -1051,13 +740,13 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
   // While we *might* decode the ATA ERROR register, at the moment it
   // doesn't make much sense: we don't care in detail why the error
   // happened.
-  
+
   if (ata->status || (ata->command & 0x21)) {
     pout("Command failed, ata.status=(0x%2.2x), ata.command=(0x%2.2x), ata.flags=(0x%2.2x)\n",ata->status,ata->command,ata->flags);
     errno=EIO;
     return -1;
   }
-  
+
   // If this is a read data command, copy data to output buffer
   if (readdata) {
     if (m_escalade_type==CONTROLLER_3WARE_9000_CHAR)
@@ -1066,36 +755,36 @@ int freebsd_escalade_device::ata_command_interface(smart_command_set command, in
 
   // For STATUS_CHECK, we need to check register values
   if (command==STATUS_CHECK) {
-    
+
     // To find out if the SMART RETURN STATUS is good or failing, we
     // need to examine the values of the Cylinder Low and Cylinder
     // High Registers.
-    
+
     unsigned short cyl_lo=ata->cylinder_lo;
     unsigned short cyl_hi=ata->cylinder_hi;
-    
+
     // If values in Cyl-LO and Cyl-HI are unchanged, SMART status is good.
     if (cyl_lo==0x4F && cyl_hi==0xC2)
       return 0;
-    
+
     // If values in Cyl-LO and Cyl-HI are as follows, SMART status is FAIL
     if (cyl_lo==0xF4 && cyl_hi==0x2C)
       return 1;
-    
+
       errno=EIO;
       return -1;
   }
-  
+
   // copy sector count register (one byte!) to return data
   if (command==CHECK_POWER_MODE)
     *data=*(char *)&(ata->sector_count);
-  
+
   // look for nonexistent devices/ports
   if (command==IDENTIFY && !nonempty((unsigned char *)data, 512)) {
     errno=ENODEV;
     return -1;
   }
-  
+
   return 0;
 }
 
@@ -1113,6 +802,7 @@ public:
 
 protected:
   virtual int ata_command_interface(smart_command_set command, int select, char * data);
+  virtual bool open();
 
 private:
   unsigned char m_hpt_data[3]; ///< controller/channel/port
@@ -1128,20 +818,28 @@ freebsd_highpoint_device::freebsd_highpoint_device(smart_interface * intf, const
   set_info().info_name = strprintf("%s [hpt_disk_%u/%u/%u]", dev_name, m_hpt_data[0], m_hpt_data[1], m_hpt_data[2]);
 }
 
+bool freebsd_highpoint_device::open()
+{
+  const char *dev = get_dev_name();
+  int fd;
+  
+  if ((fd = ::open(dev,O_RDWR))<0) {
+    set_err(errno);
+    return false;
+  }
+  set_fd(fd);
+  return true;
+}
+
 int freebsd_highpoint_device::ata_command_interface(smart_command_set command, int select, char * data)
 {
-   int fd=get_fd(); 
+  int fd=get_fd(); 
   int ids[2];
-  struct freebsd_dev_channel* fbcon;
   HPT_IOCTL_PARAM param;
   HPT_CHANNEL_INFO_V2 info;
   unsigned char* buff[512 + 2 * sizeof(HPT_PASS_THROUGH_HEADER)];
   PHPT_PASS_THROUGH_HEADER pide_pt_hdr, pide_pt_hdr_out;
 
-  // check that "file descriptor" is valid
-  if (isnotopen(&fd, &fbcon))
-      return -1;
-
   // get internal deviceid
   ids[0] = m_hpt_data[0] - 1;
   ids[1] = m_hpt_data[1] - 1;
@@ -1159,7 +857,7 @@ int freebsd_highpoint_device::ata_command_interface(smart_command_set command, i
     param.ctrl_code = HPT_IOCTL_GET_CHANNEL_INFO;
     param.out_size = sizeof(HPT_CHANNEL_INFO);
   }
-  if (ioctl(fbcon->device, HPT_DO_IOCONTROL, &param)!=0 ||
+  if (ioctl(fd, HPT_DO_IOCONTROL, &param)!=0 ||
       info.devices[m_hpt_data[2]-1]==0) {
     return -1;
   }
@@ -1244,12 +942,13 @@ int freebsd_highpoint_device::ata_command_interface(smart_command_set command, i
 
   pide_pt_hdr_out = (PHPT_PASS_THROUGH_HEADER)param.out;
 
-  if ((ioctl(fbcon->device, HPT_DO_IOCONTROL, &param)!=0) ||
+  if ((ioctl(fd, HPT_DO_IOCONTROL, &param)!=0) ||
       (pide_pt_hdr_out->command & 1)) {
     return -1;
   }
 
-  if (command==STATUS_CHECK){
+  if (command==STATUS_CHECK)
+  {
     unsigned const char normal_lo=0x4f, normal_hi=0xc2;
     unsigned const char failed_lo=0xf4, failed_hi=0x2c;
     unsigned char low,high;
@@ -1280,7 +979,8 @@ int freebsd_highpoint_device::ata_command_interface(smart_command_set command, i
   else if (command==CHECK_POWER_MODE)
     data[0] = pide_pt_hdr_out->sectorcount & 0xff;
   else if (pide_pt_hdr->protocol==HPT_READ)
-    memcpy(data, (unsigned char *)buff + 2 * sizeof(HPT_PASS_THROUGH_HEADER), pide_pt_hdr->sectors * 512);
+    memcpy(data, (unsigned char *)buff + 2 * sizeof(HPT_PASS_THROUGH_HEADER), 
+      pide_pt_hdr->sectors * 512);
   return 0;
 }
 
@@ -1298,8 +998,33 @@ public:
   virtual smart_device * autodetect_open();
 
   virtual bool scsi_pass_through(scsi_cmnd_io * iop);
+  
+  virtual bool open();
+
+  virtual bool close();
+  
+private:
+  int m_fd;
+  struct cam_device *m_camdev;
 };
 
+bool freebsd_scsi_device::open(){
+  const char *dev = get_dev_name();
+  
+  if ((m_camdev = cam_open_device(dev, O_RDWR)) == NULL) {
+    set_err(errno);
+    return false;
+  }
+  set_fd(m_camdev->fd);
+  return true;
+}
+
+bool freebsd_scsi_device::close(){
+  cam_close_device(m_camdev);
+  set_fd(-1);
+  return true;
+}
+
 freebsd_scsi_device::freebsd_scsi_device(smart_interface * intf,
   const char * dev_name, const char * req_type)
 : smart_device(intf, dev_name, "scsi", req_type),
@@ -1307,79 +1032,72 @@ freebsd_scsi_device::freebsd_scsi_device(smart_interface * intf,
 {
 }
 
-// Interface to SCSI devices.  See os_linux.c
-int do_normal_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report)
+
+bool freebsd_scsi_device::scsi_pass_through(scsi_cmnd_io * iop)
 {
-  struct freebsd_dev_channel* con = NULL;
-  struct cam_device* cam_dev = NULL;
+  int report=con->reportscsiioctl;
   union ccb *ccb;
-  
-  
-    if (report > 0) {
-        unsigned int k;
-        const unsigned char * ucp = iop->cmnd;
-        const char * np;
-
-        np = scsi_get_opcode_name(ucp[0]);
-        pout(" [%s: ", np ? np : "<unknown opcode>");
-        for (k = 0; k < iop->cmnd_len; ++k)
-            pout("%02x ", ucp[k]);
-        if ((report > 1) && 
-            (DXFER_TO_DEVICE == iop->dxfer_dir) && (iop->dxferp)) {
-            int trunc = (iop->dxfer_len > 256) ? 1 : 0;
-
-            pout("]\n  Outgoing data, len=%d%s:\n", (int)iop->dxfer_len,
-                 (trunc ? " [only first 256 bytes shown]" : ""));
-            dStrHex(iop->dxferp, (trunc ? 256 : iop->dxfer_len) , 1);
-        }
-        else
-            pout("]");
-    }
-
-  // check that "file descriptor" is valid
-  if (isnotopen(&fd,&con))
-      return -ENOTTY;
 
+  if (report > 0) {
+    unsigned int k;
+    const unsigned char * ucp = iop->cmnd;
+    const char * np;
+
+    np = scsi_get_opcode_name(ucp[0]);
+    pout(" [%s: ", np ? np : "<unknown opcode>");
+    for (k = 0; k < iop->cmnd_len; ++k)
+      pout("%02x ", ucp[k]);
+    if ((report > 1) && 
+      (DXFER_TO_DEVICE == iop->dxfer_dir) && (iop->dxferp)) {
+    int trunc = (iop->dxfer_len > 256) ? 1 : 0;
+
+    pout("]\n  Outgoing data, len=%d%s:\n", (int)iop->dxfer_len,
+      (trunc ? " [only first 256 bytes shown]" : ""));
+    dStrHex(iop->dxferp, (trunc ? 256 : iop->dxfer_len) , 1);
+      }
+      else
+        pout("]");
+  }
 
-  if (!(cam_dev = cam_open_spec_device(con->devname,con->unitnum,O_RDWR,NULL))) {
-    warnx("%s",cam_errbuf);
-    return -EIO;
+  if(m_camdev==NULL) {
+    warnx("error: camdev=0!");
+    return -ENOTTY;
   }
 
-  if (!(ccb = cam_getccb(cam_dev))) {
+  if (!(ccb = cam_getccb(m_camdev))) {
     warnx("error allocating ccb");
     return -ENOMEM;
   }
 
   // clear out structure, except for header that was filled in for us
   bzero(&(&ccb->ccb_h)[1],
-        sizeof(struct ccb_scsiio) - sizeof(struct ccb_hdr));
+    sizeof(struct ccb_scsiio) - sizeof(struct ccb_hdr));
 
   cam_fill_csio(&ccb->csio,
-                /*retrires*/ 1,
-                /*cbfcnp*/ NULL,
-                /* flags */ (iop->dxfer_dir == DXFER_NONE ? CAM_DIR_NONE :(iop->dxfer_dir == DXFER_FROM_DEVICE ? CAM_DIR_IN : CAM_DIR_OUT)),
-                /* tagaction */ MSG_SIMPLE_Q_TAG,
-                /* dataptr */ iop->dxferp,
-                /* datalen */ iop->dxfer_len,
-                /* senselen */ iop->max_sense_len,
-                /* cdblen */ iop->cmnd_len,
-                /* timout (converted to seconds) */ iop->timeout*1000);
+    /*retrires*/ 1,
+    /*cbfcnp*/ NULL,
+    /* flags */ (iop->dxfer_dir == DXFER_NONE ? CAM_DIR_NONE :(iop->dxfer_dir == DXFER_FROM_DEVICE ? CAM_DIR_IN : CAM_DIR_OUT)),
+    /* tagaction */ MSG_SIMPLE_Q_TAG,
+    /* dataptr */ iop->dxferp,
+    /* datalen */ iop->dxfer_len,
+    /* senselen */ iop->max_sense_len,
+    /* cdblen */ iop->cmnd_len,
+    /* timout (converted to seconds) */ iop->timeout*1000);
   memcpy(ccb->csio.cdb_io.cdb_bytes,iop->cmnd,iop->cmnd_len);
 
-  if (cam_send_ccb(cam_dev,ccb) < 0) {
+  if (cam_send_ccb(m_camdev,ccb) < 0) {
     warn("error sending SCSI ccb");
- #if __FreeBSD_version > 500000
-    cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
- #endif
+#if (FREEBSDVER > 500000)
+    cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
+#endif
     cam_freeccb(ccb);
     return -EIO;
   }
 
-  if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
- #if __FreeBSD_version > 500000
-    cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
- #endif
+  if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) {
+#if (FREEBSDVER > 500000)
+    cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
+#endif
     cam_freeccb(ccb);
     return -EIO;
   }
@@ -1392,67 +1110,18 @@ int do_normal_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report)
   iop->scsi_status = ccb->csio.scsi_status;
 
   cam_freeccb(ccb);
-  
-  if (cam_dev)
-    cam_close_device(cam_dev);
 
   if (report > 0) {
     int trunc;
 
     pout("  status=0\n");
     trunc = (iop->dxfer_len > 256) ? 1 : 0;
-    
+
     pout("  Incoming data, len=%d%s:\n", (int)iop->dxfer_len,
-         (trunc ? " [only first 256 bytes shown]" : ""));
+      (trunc ? " [only first 256 bytes shown]" : ""));
     dStrHex(iop->dxferp, (trunc ? 256 : iop->dxfer_len) , 1);
   }
-  return 0;
-}
-
 
-/* Check and call the right interface. Maybe when the do_generic_scsi_cmd_io interface is better
-   we can take off this crude way of calling the right interface */
-int do_scsi_cmnd_io(int dev_fd, struct scsi_cmnd_io * iop, int report)
-{
-struct freebsd_dev_channel *fdchan;
-     switch(m_controller_type)
-     {
-         case CONTROLLER_CCISS:
-#ifdef HAVE_DEV_CISS_CISSIO_H
-            // check that "file descriptor" is valid
-            if (isnotopen(&dev_fd,&fdchan))
-                return -ENOTTY;
-             return cciss_io_interface(fdchan->device, m_controller_port-1, iop, report);
-#else
-             {
-                 static int warned = 0;
-                 if (!warned) {
-                     pout("CCISS support is not available in this build of smartmontools,\n"
-                          "/usr/src/sys/dev/ciss/cissio.h was not available at build time.\n\n");
-                     warned = 1;
-                 }
-             }
-             return -ENOSYS;
-#endif
-             // not reached
-             break;
-         default:
-             return do_normal_scsi_cmnd_io(dev_fd, iop, report);
-             // not reached
-             break;
-     }
-}
-
-bool freebsd_scsi_device::scsi_pass_through(scsi_cmnd_io * iop)
-{
-  unsigned char oldtype = m_controller_type, oldport = m_controller_port;
-  m_controller_type = CONTROLLER_SCSI; m_controller_port = 0;
-  int status = do_scsi_cmnd_io(get_fd(), iop, con->reportscsiioctl);
-  m_controller_type = oldtype; m_controller_port = oldport;
-  if (status < 0) {
-      set_err(-status);
-      return false;
-  }
   return true;
 }
 
@@ -1468,11 +1137,28 @@ public:
   freebsd_cciss_device(smart_interface * intf, const char * name, unsigned char disknum);
 
   virtual bool scsi_pass_through(scsi_cmnd_io * iop);
+  virtual bool open();
 
 private:
   unsigned char m_disknum; ///< Disk number.
 };
 
+bool freebsd_cciss_device::open()
+{
+  const char *dev = get_dev_name();
+  int fd;
+#ifndef HAVE_DEV_CISS_CISSIO_H
+  pout("CCISS support is not available in this build of smartmontools,\n"
+    "/usr/src/sys/dev/ciss/cissio.h was not available at build time.\n\n");
+  return false;
+#endif  
+  if ((fd = ::open(dev,O_RDWR))<0) {
+    set_err(errno);
+    return false;
+  }
+  set_fd(fd);
+  return true;
+}
 
 freebsd_cciss_device::freebsd_cciss_device(smart_interface * intf,
   const char * dev_name, unsigned char disknum)
@@ -1485,15 +1171,13 @@ freebsd_cciss_device::freebsd_cciss_device(smart_interface * intf,
 
 bool freebsd_cciss_device::scsi_pass_through(scsi_cmnd_io * iop)
 {
-  // See os_linux.cpp
-  unsigned char oldtype = m_controller_type, oldport = m_controller_port;
-  m_controller_type = CONTROLLER_CCISS; m_controller_port = m_disknum+1;
-  int status = do_scsi_cmnd_io(get_fd(), iop, con->reportscsiioctl);
-  m_controller_type = oldtype; m_controller_port = oldport;
-  if (status < 0) {
-      set_err(-status);
-      return false;
-  }
+#ifdef HAVE_DEV_CISS_CISSIO_H
+  int status = cciss_io_interface(get_fd(), m_disknum, iop, con->reportscsiioctl);
+  if (status < 0)
+      return set_err(-status);
+  return true;
+#endif
+  // not reached
   return true;
 }
 
@@ -1531,34 +1215,25 @@ smart_device * freebsd_scsi_device::autodetect_open()
   int avail_len = req_buff[4] + 5;
   int len = (avail_len < req_len ? avail_len : req_len);
   if (len < 36)
-      return this;
+    return this;
 
   // Use INQUIRY to detect type
-  smart_device * newdev = 0;
-  try {
-    // 3ware ?
-    if (!memcmp(req_buff + 8, "3ware", 5) || !memcmp(req_buff + 8, "AMCC", 4)) {
-      close();
-#if defined(_WIN32) || defined(__CYGWIN__)
-      set_err(EINVAL, "AMCC/3ware controller, please try changing device to %s,N", get_dev_name());
-#else
-      set_err(EINVAL, "AMCC/3ware controller, please try adding '-d 3ware,N',\n"
-                      "you may need to replace %s with /dev/twaN or /dev/tweN", get_dev_name());
-#endif
-      return this;
-    }
 
-    // SAT or USB ?
-    newdev = smi()->autodetect_sat_device(this, req_buff, len);
+  // 3ware ?
+  if (!memcmp(req_buff + 8, "3ware", 5) || !memcmp(req_buff + 8, "AMCC", 4)) {
+    close();
+    set_err(EINVAL, "AMCC/3ware controller, please try adding '-d 3ware,N',\n"
+                    "you may need to replace %s with /dev/twaN or /dev/tweN", get_dev_name());
+    return this;
+  }
+
+  // SAT or USB ?
+  {
+    smart_device * newdev = smi()->autodetect_sat_device(this, req_buff, len);
     if (newdev)
       // NOTE: 'this' is now owned by '*newdev'
       return newdev;
   }
-  catch (...) {
-    // Cleanup if exception occurs after newdev was allocated
-    delete newdev;
-    throw;
-  }
 
   // Nothing special found
   return this;
@@ -1572,9 +1247,9 @@ class freebsd_smart_interface
 : public /*implements*/ smart_interface
 {
 public:
-  virtual const char * get_os_version_str();
+  virtual std::string get_os_version_str();
 
-  virtual const char * get_app_examples(const char * appname);
+  virtual std::string get_app_examples(const char * appname);
 
   virtual bool scan_smart_devices(smart_device_list & devlist, const char * type,
     const char * pattern = 0);
@@ -1582,32 +1257,34 @@ public:
 protected:
   virtual ata_device * get_ata_device(const char * name, const char * type);
 
+#if FREEBSDVER > 800100
+  virtual ata_device * get_atacam_device(const char * name, const char * type);
+#endif
+
   virtual scsi_device * get_scsi_device(const char * name, const char * type);
 
   virtual smart_device * autodetect_smart_device(const char * name);
 
   virtual smart_device * get_custom_smart_device(const char * name, const char * type);
 
-  virtual const char * get_valid_custom_dev_types_str();
+  virtual std::string get_valid_custom_dev_types_str();
 };
 
 
 //////////////////////////////////////////////////////////////////////
-char sysname[256];
-const char * freebsd_smart_interface::get_os_version_str()
+
+std::string freebsd_smart_interface::get_os_version_str()
 {
- struct utsname osname;
- uname(&osname);
- snprintf(sysname, sizeof(sysname),"%s %s %s",osname.sysname, osname.release,
-        osname.machine);
-  return sysname;
+  struct utsname osname;
+  uname(&osname);
+  return strprintf("%s %s %s", osname.sysname, osname.release, osname.machine);
 }
 
-const char * freebsd_smart_interface::get_app_examples(const char * appname)
+std::string freebsd_smart_interface::get_app_examples(const char * appname)
 {
   if (!strcmp(appname, "smartctl"))
     return smartctl_examples;
-   return 0;
+  return "";
 }
 
 ata_device * freebsd_smart_interface::get_ata_device(const char * name, const char * type)
@@ -1615,121 +1292,33 @@ ata_device * freebsd_smart_interface::get_ata_device(const char * name, const ch
   return new freebsd_ata_device(this, name, type);
 }
 
-scsi_device * freebsd_smart_interface::get_scsi_device(const char * name, const char * type)
+#if FREEBSDVER > 800100
+ata_device * freebsd_smart_interface::get_atacam_device(const char * name, const char * type)
 {
-  return new freebsd_scsi_device(this, name, type);
+  return new freebsd_atacam_device(this, name, type);
 }
+#endif
 
-static int 
-cam_getumassno(char * devname) {
-       union ccb ccb;
-       int bufsize, fd;
-       unsigned int i;
-       int error = -1;
-       char devstring[256];
-       
-       if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) {
-               warn("couldn't open %s", XPT_DEVICE);
-               return(1);
-       }
-       bzero(&ccb, sizeof(union ccb));
-
-       ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
-       ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
-       ccb.ccb_h.target_lun = CAM_LUN_WILDCARD;
-
-       ccb.ccb_h.func_code = XPT_DEV_MATCH;
-       bufsize = sizeof(struct dev_match_result) * 100;
-       ccb.cdm.match_buf_len = bufsize;
-       ccb.cdm.matches = (struct dev_match_result *)malloc(bufsize);
-       if (ccb.cdm.matches == NULL) {
-               warnx("can't malloc memory for matches");
-               close(fd);
-               return(1);
-       }
-       ccb.cdm.num_matches = 0;
-       /*
-        * We fetch all nodes, since we display most of them in the default
-        * case, and all in the verbose case.
-        */
-       ccb.cdm.num_patterns = 0;
-       ccb.cdm.pattern_buf_len = 0;
-       /*
-        * We do the ioctl multiple times if necessary, in case there are
-        * more than 100 nodes in the EDT.
-        */
-        
-       do {
-               if (ioctl(fd, CAMIOCOMMAND, &ccb) == -1) {
-                       warn("error sending CAMIOCOMMAND ioctl");
-                       error = -1;
-                       break;
-               }
-               if ((ccb.ccb_h.status != CAM_REQ_CMP)
-                || ((ccb.cdm.status != CAM_DEV_MATCH_LAST)
-                   && (ccb.cdm.status != CAM_DEV_MATCH_MORE))) {
-                       warnx("got CAM error %#x, CDM error %d\n",
-                             ccb.ccb_h.status, ccb.cdm.status);
-                       error = -1;
-                       break;
-               }
-
-               struct bus_match_result *bus_result = 0;
-               for (i = 0; i < ccb.cdm.num_matches; i++) {
-                       switch (ccb.cdm.matches[i].type) {
-                       case DEV_MATCH_BUS: {
-                               // struct bus_match_result *bus_result;
-                               bus_result =
-                                       &ccb.cdm.matches[i].result.bus_result;
-                               break;
-                       }
-                       case DEV_MATCH_DEVICE: {
-                               /* we are not interested in device name */
-                               break;
-                       }
-                       case DEV_MATCH_PERIPH: {
-                               struct periph_match_result *periph_result;
-
-                               periph_result =
-                                     &ccb.cdm.matches[i].result.periph_result;
-
-                               snprintf(devstring,sizeof(devstring),"%s%d",periph_result->periph_name,periph_result->unit_number);
-                               if(strcmp(devstring,devname)==0){ /* found our device */
-                                   if(strcmp(bus_result->dev_name,"umass-sim")) {
-                                       close(fd);
-                                       return -1; /* non usb device found, giving up */
-                                   }
-                                   /* return bus number */
-                                   return  bus_result->unit_number;
-                               }
-                               break;
-                       }
-                       
-                       default:
-                               fprintf(stdout, "WARN: unknown match type\n");
-                               break;
-                       }
-               }
-
-       } while ((ccb.ccb_h.status == CAM_REQ_CMP)
-               && (ccb.cdm.status == CAM_DEV_MATCH_MORE));
-       close(fd);
-       free(ccb.cdm.matches);
-       return(error); /* no device found */
+scsi_device * freebsd_smart_interface::get_scsi_device(const char * name, const char * type)
+{
+  return new freebsd_scsi_device(this, name, type);
 }
 
-
-// we are using CAM subsystem XPT enumerator to found all SCSI devices on system
-// despite of it's names
+// we are using CAM subsystem XPT enumerator to found all CAM (scsi/usb/ada/...)
+// devices on system despite of it's names
 //
 // If any errors occur, leave errno set as it was returned by the
 // system call, and return <0.
 //
+// arguments: 
+// names: resulting array
+// show_all - export duplicate device name or not
+//
 // Return values:
 // -1:   error
 // >=0: number of discovered devices
 
-int get_dev_names_scsi(char*** names) {
+int get_dev_names_cam(char*** names, bool show_all) {
   int n = 0;
   char** mp = NULL;
   unsigned int i;
@@ -1742,7 +1331,7 @@ int get_dev_names_scsi(char*** names) {
   // in case of non-clean exit
   *names=NULL;
   ccb.cdm.matches = NULL;
-
   if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) {
     if (errno == ENOENT) /* There are no CAM device on this computer */
       return 0;
@@ -1772,13 +1361,12 @@ int get_dev_names_scsi(char*** names) {
   ccb.cdm.match_buf_len = bufsize;
   ccb.cdm.matches = (struct dev_match_result *)malloc(bufsize);
   if (ccb.cdm.matches == NULL) {
-       serrno = errno;
-       pout("can't malloc memory for matches on line %d\n", __LINE__);
-       n = -1;
-       goto end;
+    serrno = errno;
+    pout("can't malloc memory for matches on line %d\n", __LINE__);
+    n = -1;
+    goto end;
   }
   ccb.cdm.num_matches = 0;
-
   ccb.cdm.num_patterns = 0;
   ccb.cdm.pattern_buf_len = 0;
 
@@ -1795,8 +1383,8 @@ int get_dev_names_scsi(char*** names) {
     }
 
     if ((ccb.ccb_h.status != CAM_REQ_CMP)
-     || ((ccb.cdm.status != CAM_DEV_MATCH_LAST)
-        && (ccb.cdm.status != CAM_DEV_MATCH_MORE))) {
+      || ((ccb.cdm.status != CAM_DEV_MATCH_LAST)
+      && (ccb.cdm.status != CAM_DEV_MATCH_MORE))) {
       pout("got CAM error %#x, CDM error %d\n", ccb.ccb_h.status, ccb.cdm.status);
       serrno = ENXIO;
       n = -1;
@@ -1812,8 +1400,8 @@ int get_dev_names_scsi(char*** names) {
         bus_result = &ccb.cdm.matches[i].result.bus_result;
 
         if (strcmp(bus_result->dev_name,"ata") == 0 /* ATAPICAM devices will be probed as ATA devices, skip'em there */
-         || strcmp(bus_result->dev_name,"xpt") == 0) /* skip XPT bus at all */
-          skip_bus = 1;
+          || strcmp(bus_result->dev_name,"xpt") == 0) /* skip XPT bus at all */
+        skip_bus = 1;
         else
           skip_bus = 0;
         changed = 1;
@@ -1824,14 +1412,15 @@ int get_dev_names_scsi(char*** names) {
           skip_device = 1;
         else
           skip_device = 0;
-
-//        /* Shall we skip non T_DIRECT devices ? */
-//        if (dev_result->inq_data.device != T_DIRECT)
-//          skip_device = 1;
+        
+        //        /* Shall we skip non T_DIRECT devices ? */
+        //        if (dev_result->inq_data.device != T_DIRECT)
+        //          skip_device = 1;
         changed = 1;
-      } else if (ccb.cdm.matches[i].type == DEV_MATCH_PERIPH && skip_device == 0) { 
+      } else if (ccb.cdm.matches[i].type == DEV_MATCH_PERIPH && 
+          (skip_device == 0 || show_all)) { 
         /* One device may be populated as many peripherals (pass0 & da0 for example). 
-         * We are searching for latest name
+        * We are searching for latest name
         */
         periph_result =  &ccb.cdm.matches[i].result.periph_result;
         free(devname);
@@ -1844,8 +1433,7 @@ int get_dev_names_scsi(char*** names) {
         };
         changed = 0;
       };
-      
-      if (changed == 1 && devname != NULL) {
+      if ((changed == 1 || show_all) && devname != NULL) {
         mp[n] = devname;
         devname = NULL;
         bytes+=1+strlen(mp[n]);
@@ -1906,7 +1494,7 @@ int get_dev_names_ata(char*** names) {
     n = -1;
     goto end;
   };
-  
+
   if (ioctl(fd, IOCATAGMAXCHANNEL, &maxchannel) < 0) {
     serrno = errno;
     pout("ioctl(IOCATAGMAXCHANNEL) on /dev/ata failed: %s\n", strerror(errno));
@@ -1925,7 +1513,7 @@ int get_dev_names_ata(char*** names) {
 
   for (devices.channel = 0; devices.channel < maxchannel && n < MAX_NUM_DEV; devices.channel++) {
     int j;
-    
+
     if (ioctl(fd, IOCATADEVICES, &devices) < 0) {
       if (errno == ENXIO)
         continue; /* such channel not exist */
@@ -1948,7 +1536,7 @@ int get_dev_names_ata(char*** names) {
   };  
   mp = (char **)reallocf(mp,n*(sizeof (char*))); // shrink to correct size
   bytes += (n)*(sizeof(char*)); // and set allocated byte count
-      
+
 end:
   if (fd>=0)
     close(fd);
@@ -1985,8 +1573,8 @@ bool freebsd_smart_interface::scan_smart_devices(smart_device_list & devlist,
   }
 
   char * * scsinames = 0; int numscsi = 0;
-  if (!type || !strcmp(type, "scsi")) {
-    numscsi = get_dev_names_scsi(&scsinames);
+  if (!type || !strcmp(type, "scsi")) { // do not export duplicated names
+    numscsi = get_dev_names_cam(&scsinames,0);
     if (numscsi < 0) {
       set_err(ENOMEM);
       return false;
@@ -2000,148 +1588,241 @@ bool freebsd_smart_interface::scan_smart_devices(smart_device_list & devlist,
   for (i = 0; i < numata; i++) {
     ata_device * atadev = get_ata_device(atanames[i], type);
     if (atadev)
-      devlist.add(atadev);
+      devlist.push_back(atadev);
   }
 
   for (i = 0; i < numscsi; i++) {
-    scsi_device * scsidev = get_scsi_device(scsinames[i], type);
-    if (scsidev)
-      devlist.add(scsidev);
+    if(!*type) { // try USB autodetection if no type specified
+      smart_device * smartdev = autodetect_smart_device(scsinames[i]);
+      if(smartdev)
+        devlist.push_back(smartdev);
+    }
+    else {
+      scsi_device * scsidev = get_scsi_device(scsinames[i], type);
+      if (scsidev)
+        devlist.push_back(scsidev);
+    }
   }
   return true;
 }
 
 
+#if (FREEBSDVER < 800000) // without this build fail on FreeBSD 8
 static char done[USB_MAX_DEVICES];
-// static unsigned short vendor_id = 0, product_id = 0, version = 0;
 
 static int usbdevinfo(int f, int a, int rec, int busno, unsigned short & vendor_id,
-                       unsigned short & product_id, unsigned short & version)
-{
-       struct usb_device_info di;
-       int e, p, i;
-       char devname[256];
-
-       snprintf(devname, sizeof(devname),"umass%d",busno);
-       
-       di.udi_addr = a;
-       e = ioctl(f, USB_DEVICEINFO, &di);
-       if (e) {
-               if (errno != ENXIO)
-                       printf("addr %d: I/O error\n", a);
-               return 0;
-       }
-       done[a] = 1;
-       
-               // list devices
-               for (i = 0; i < USB_MAX_DEVNAMES; i++) {
-                       if (di.udi_devnames[i][0]) {
-                               if(strcmp(di.udi_devnames[i],devname)==0) {
-                                // device found!
-                                   vendor_id = di.udi_vendorNo;
-                                   product_id = di.udi_productNo;
-                                   version = di.udi_releaseNo;
-                                   return 1;
-                                   // FIXME
-                               }
-                       }
-               }
-       if (!rec)
-               return 0;
-       for (p = 0; p < di.udi_nports; p++) {
-               int s = di.udi_ports[p];
-               if (s >= USB_MAX_DEVICES) {
-                       continue;
-               }
-               if (s == 0)
-                       printf("addr 0 should never happen!\n");
-               else {
-                       if(usbdevinfo(f, s, 1, busno, vendor_id, product_id, version)) return 1;
-               }
-       }
-       return 0;
-}
-
+  unsigned short & product_id, unsigned short & version)
+{ 
 
+  struct usb_device_info di;
+  int e, p, i;
+  char devname[256];
 
+  snprintf(devname, sizeof(devname),"umass%d",busno);
 
-static int usbdevlist(int busno,unsigned short & vendor_id,
-                       unsigned short & product_id, unsigned short & version)
-{
-    int  i, f, a, rc;
-    char buf[50];
-    int ncont;
-
-    for (ncont = 0, i = 0; i < 10; i++) {
-       snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
-       f = open(buf, O_RDONLY);
-       if (f >= 0) {
-           memset(done, 0, sizeof done);
-           for (a = 1; a < USB_MAX_DEVICES; a++) {
-               if (!done[a]) {
-                   rc = usbdevinfo(f, a, 1, busno,vendor_id, product_id, version);
-                   if(rc) return 1;
-               }
-               
-           }
-       close(f);
-       } else {
-           if (errno == ENOENT || errno == ENXIO)
-               continue;
-           warn("%s", buf);
-       }
-       ncont++;
+  di.udi_addr = a;
+  e = ioctl(f, USB_DEVICEINFO, &di);
+  if (e) {
+    if (errno != ENXIO)
+      printf("addr %d: I/O error\n", a);
+    return 0;
+  }
+  done[a] = 1;
+
+  // list devices
+  for (i = 0; i < USB_MAX_DEVNAMES; i++) {
+    if (di.udi_devnames[i][0]) {
+      if(strcmp(di.udi_devnames[i],devname)==0) {
+        // device found!
+        vendor_id = di.udi_vendorNo;
+        product_id = di.udi_productNo;
+        version = di.udi_releaseNo;
+        return 1;
+        // FIXME
+      }
     }
+  }
+  if (!rec)
     return 0;
+  for (p = 0; p < di.udi_nports; p++) {
+    int s = di.udi_ports[p];
+    if (s >= USB_MAX_DEVICES) {
+      continue;
+    }
+    if (s == 0)
+      printf("addr 0 should never happen!\n");
+    else {
+      if(usbdevinfo(f, s, 1, busno, vendor_id, product_id, version)) return 1;
+    }
+  }
+  return 0;
 }
+#endif
+
 
-// Get USB bridge ID for "/dev/daX"
-static bool get_usb_id(const char * path, unsigned short & vendor_id,
-                       unsigned short & product_id, unsigned short & version)
+static int usbdevlist(int busno,unsigned short & vendor_id,
+  unsigned short & product_id, unsigned short & version)
 {
-  // Only "/dev/daX" supported
-  if (!(!strncmp(path, "/dev/da", 7) && !strchr(path + 7, '/')))
-    return false;
-   int bus = cam_getumassno((char *)path+5);
-   
-  if (bus == -1) 
-    return false;
+#if (FREEBSDVER >= 800000) // libusb2 interface
+  struct libusb20_device *pdev = NULL;
+  struct libusb20_backend *pbe;
+  uint32_t matches = 0;
+  char buf[128]; // do not change!
+  char devname[128];
+  uint8_t n;
+  struct LIBUSB20_DEVICE_DESC_DECODED *pdesc;
+
+  pbe = libusb20_be_alloc_default();
+
+  while ((pdev = libusb20_be_device_foreach(pbe, pdev))) {
+    matches++;
+
+    if (libusb20_dev_open(pdev, 0)) {
+      warnx("libusb20_dev_open: could not open device");
+      return 0;
+    }
+
+    pdesc=libusb20_dev_get_device_desc(pdev);
+
+    snprintf(devname, sizeof(devname),"umass%d:",busno);
+    for (n = 0; n != 255; n++) {
+      if (libusb20_dev_get_iface_desc(pdev, n, buf, sizeof(buf)))
+        break;
+      if (buf[0] == 0)
+        continue;
+      if(strncmp(buf,devname,strlen(devname))==0){
+        // found!
+        vendor_id = pdesc->idVendor;
+        product_id = pdesc->idProduct;
+        version = pdesc->bcdDevice;
+        libusb20_dev_close(pdev);
+        libusb20_be_free(pbe);
+        return 1;
+      }
+    }
 
-  usbdevlist(bus,vendor_id,
-                       product_id, version);
+    libusb20_dev_close(pdev);
+  }
 
-  return true;
-}
+  if (matches == 0) {
+    printf("No device match or lack of permissions.\n");
+  }
+
+  libusb20_be_free(pbe);
+
+  return false;
+#else // freebsd < 8.0 USB stack, ioctl interface
 
+  int  i, f, a, rc;
+  char buf[50];
+  int ncont;
+
+  for (ncont = 0, i = 0; i < 10; i++) {
+    snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
+    f = open(buf, O_RDONLY);
+    if (f >= 0) {
+      memset(done, 0, sizeof done);
+      for (a = 1; a < USB_MAX_DEVICES; a++) {
+        if (!done[a]) {
+          rc = usbdevinfo(f, a, 1, busno,vendor_id, product_id, version);
+          if(rc) return 1;
+        }
+
+      }
+      close(f);
+    } else {
+      if (errno == ENOENT || errno == ENXIO)
+        continue;
+      warn("%s", buf);
+    }
+    ncont++;
+  }
+  return 0;
+#endif
+}
 
 smart_device * freebsd_smart_interface::autodetect_smart_device(const char * name)
 {
-  int guess = parse_ata_chan_dev(name,NULL);
   unsigned short vendor_id = 0, product_id = 0, version = 0;
-  
-  switch (guess) {
-  case CONTROLLER_ATA : 
-    return new freebsd_ata_device(this, name, "");
-  case CONTROLLER_SCSI: 
-    // Try to detect possible USB->(S)ATA bridge
-    if (get_usb_id(name, vendor_id, product_id, version)) {
-      const char * usbtype = get_usb_dev_type_by_id(vendor_id, product_id, version);
-      if (!usbtype)
-        return 0;
-      // Return SAT/USB device for this type
-      // (Note: freebsd_scsi_device::autodetect_open() will not be called in this case)
-      return get_sat_device(usbtype, new freebsd_scsi_device(this, name, ""));
+  struct cam_device *cam_dev;
+  union ccb ccb;
+  int bus=-1;
+  int i;
+  int len;
+
+  // if dev_name null, or string length zero
+  if (!name || !(len = strlen(name)))
+    return false;
+
+  // check ATA bus
+  char * * atanames = 0; int numata = 0;
+  numata = get_dev_names_ata(&atanames);
+  if (numata > 0) {
+    // check ATA/ATAPI devices
+    for (i = 0; i < numata; i++) {
+      if(!strcmp(atanames[i],name)) {
+        return new freebsd_ata_device(this, name, "");
+      }
     }
-    // non usb device, handle as normal scsi
-    return new freebsd_scsi_device(this, name, "");
-  case CONTROLLER_CCISS:
-    // device - cciss, but no ID known
-    set_err(EINVAL, "Option -d cciss,N requires N to be a non-negative integer");
-    return 0;
   }
-  
-  
-  // TODO: Test autodetect device here
+  else {
+    if (numata < 0)
+      pout("Unable to get ATA device list\n");
+  }
+
+  // check CAM
+  char * * scsinames = 0; int numscsi = 0;
+  numscsi = get_dev_names_cam(&scsinames, 1);
+  if (numscsi > 0) {
+    // check all devices on CAM bus
+    for (i = 0; i < numscsi; i++) {
+      if(strcmp(scsinames[i],name)==0)
+      { // our disk device is CAM
+        if ((cam_dev = cam_open_device(name, O_RDWR)) == NULL) {
+          // open failure
+          set_err(errno);
+          return false;
+        }
+        
+        // zero the payload
+        bzero(&(&ccb.ccb_h)[1], PATHINQ_SETTINGS_SIZE);
+        ccb.ccb_h.func_code = XPT_PATH_INQ; // send PATH_INQ to the device
+        if (ioctl(cam_dev->fd, CAMIOCOMMAND, &ccb) == -1) {
+          warn("Get Transfer Settings CCB failed\n"
+            "%s", strerror(errno));
+          cam_close_device(cam_dev);
+          return 0;
+        }
+        // now check if we are working with USB device, see umass.c
+        if(strcmp(ccb.cpi.dev_name,"umass-sim") == 0) { // USB device found
+          usbdevlist(bus,vendor_id, product_id, version);
+          int bus=ccb.cpi.unit_number; // unit_number will match umass number
+          cam_close_device(cam_dev);
+          if(usbdevlist(bus,vendor_id, product_id, version)){
+            const char * usbtype = get_usb_dev_type_by_id(vendor_id, product_id, version);
+            if (!usbtype)
+              return false;
+            return get_sat_device(usbtype, new freebsd_scsi_device(this, name, ""));
+          }
+        }
+#if FREEBSDVER > 800100
+        // check if we have ATA device connected to CAM (ada)
+        if(ccb.cpi.protocol == PROTO_ATA){
+          cam_close_device(cam_dev);
+          return new freebsd_atacam_device(this, name, "");
+        }
+#endif
+        // close cam device, we don`t need it anymore
+        cam_close_device(cam_dev);
+        // handle as usual scsi
+        return new freebsd_scsi_device(this, name, "");      
+      }
+    }
+  } // numscsi > 0
+  else {
+    if(numscsi<0) pout("Unable to get CAM device list\n");
+  }
+  // device type unknown
   return 0;
 }
 
@@ -2149,7 +1830,10 @@ smart_device * freebsd_smart_interface::autodetect_smart_device(const char * nam
 smart_device * freebsd_smart_interface::get_custom_smart_device(const char * name, const char * type)
 {
   // 3Ware ?
-  int disknum = -1, n1 = -1, n2 = -1;
+  static const char * fbsd_dev_twe_ctrl = "/dev/twe";
+  static const char * fbsd_dev_twa_ctrl = "/dev/twa";
+  int disknum = -1, n1 = -1, n2 = -1, contr = -1;
+
   if (sscanf(type, "3ware,%n%d%n", &n1, &disknum, &n2) == 1 || n1 == 6) {
     if (n2 != (int)strlen(type)) {
       set_err(EINVAL, "Option -d 3ware,N requires N to be a non-negative integer");
@@ -2159,10 +1843,21 @@ smart_device * freebsd_smart_interface::get_custom_smart_device(const char * nam
       set_err(EINVAL, "Option -d 3ware,N (N=%d) must have 0 <= N <= 127", disknum);
       return 0;
     }
-    int contr = parse_ata_chan_dev(name,NULL);
-    if (contr != CONTROLLER_3WARE_9000_CHAR && contr != CONTROLLER_3WARE_678K_CHAR)
-      contr = CONTROLLER_3WARE_678K;
-     return new freebsd_escalade_device(this, name, contr, disknum);
+
+    // guess 3ware device type based on device name
+    if (!strncmp(fbsd_dev_twa_ctrl, name, strlen(fbsd_dev_twa_ctrl))){
+      contr=CONTROLLER_3WARE_9000_CHAR;
+    }
+    if (!strncmp(fbsd_dev_twe_ctrl, name, strlen(fbsd_dev_twe_ctrl))){
+      contr=CONTROLLER_3WARE_678K_CHAR;
+    }
+
+    if(contr == -1){
+      set_err(EINVAL, "3ware controller type unknown, use %sX or %sX devices", 
+        fbsd_dev_twe_ctrl, fbsd_dev_twa_ctrl);
+      return 0;
+    }
+    return new freebsd_escalade_device(this, name, contr, disknum);
   } 
 
   // Highpoint ?
@@ -2202,19 +1897,26 @@ smart_device * freebsd_smart_interface::get_custom_smart_device(const char * nam
     }
     return new freebsd_cciss_device(this, name, disknum);
   }
+#if FREEBSDVER > 800100
+  // adaX devices ?
+  if(!strcmp(type,"atacam"))
+    return new freebsd_atacam_device(this, name, "");
+#endif
 
   return 0;
 }
 
-const char * freebsd_smart_interface::get_valid_custom_dev_types_str()
+std::string freebsd_smart_interface::get_valid_custom_dev_types_str()
 {
-  return "marvell, 3ware,N, hpt,L/M/N, cciss,N";
+  return "3ware,N, hpt,L/M/N, cciss,N"
+#if FREEBSDVER > 800100
+  ", atacam"
+#endif
+  ;
 }
 
-
 } // namespace
 
-
 /////////////////////////////////////////////////////////////////////////////
 /// Initialize platform interface and register with smi()