Ticket #16: ada.diff

os_freebsd.cpp

@@ -71 +71 @@
 #define CONTROLLER_3WARE_9000_CHAR      0x05  // set by guess_device_type()
 #define CONTROLLER_3WARE_678K_CHAR      0x06  // set by guess_device_type()
 #define CONTROLLER_HPT                  0x09  // SATA drives behind HighPoint Raid controllers
-#define CONTROLLER_CCISS  0x10  // CCISS controller 
+#define CONTROLLER_CCISS                0x0a  // CCISS controller 
+#define CONTROLLER_ATACAM               0x0b
 
 static __unused const char *filenameandversion="$Id$";
 
@@ -315 +316 @@
 // 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_atacam_disk_prefix = "ada";
 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";
@@ -332 +334 @@
   // No Autodetection if device type was specified by user
   if (*type){
     if(!strcmp(type,"ata")) return CONTROLLER_ATA;
+    if(!strcmp(type,"atacam")) return CONTROLLER_ATACAM;
     if(!strcmp(type,"cciss")) return CONTROLLER_CCISS;
     if(!strcmp(type,"scsi") || !strcmp(type,"sat")) goto handlescsi;
     if(!strcmp(type,"3ware")){
@@ -354 +357 @@
     // else advance pointer to following characters
     dev_name += dev_prefix_len;
   }
+
+  // form /dev/ada* or ada*
+  if (!strncmp(fbsd_dev_atacam_disk_prefix, dev_name,
+               strlen(fbsd_dev_atacam_disk_prefix))) {
+    return CONTROLLER_ATACAM;
+  }
+
   // form /dev/ad* or ad*
   if (!strncmp(fbsd_dev_ata_disk_prefix, dev_name,
     strlen(fbsd_dev_ata_disk_prefix))) {
@@ -488 +498 @@
       return false;
     }
   }
+  if (parse_ok == CONTROLLER_ATACAM) {
+    if ((fdchan->camdev = ::cam_open_device(dev,O_RDWR)) == NULL) {
+      perror("cam_open_device");
+      free(fdchan);
+      errno = ENOENT;
+      return false;
+    }
+  }
 
   if (parse_ok == CONTROLLER_3WARE_678K_CHAR) {
     char buf[512];
@@ -575 +593 @@
     failed=::close(fdchan->atacommand);
 #endif
 
+  if (fdchan->camdev != NULL)
+    cam_close_device(fdchan->camdev);
+
   // 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.
@@ -602 +623 @@
 
 protected:
   virtual int ata_command_interface(smart_command_set command, int select, char * data);
+
+  #ifdef IOCATAREQUEST
+        virtual int do_cmd(struct freebsd_dev_channel* con, struct ata_ioc_request* request);
+  #endif
 };
 
 freebsd_ata_device::freebsd_ata_device(smart_interface * intf, const char * dev_name, const char * req_type)
@@ -610 +635 @@
 {
 }
 
+int freebsd_ata_device::do_cmd(struct freebsd_dev_channel* con, struct ata_ioc_request* request)
+{
+  return ioctl(con->device, IOCATAREQUEST, request);
+}
+
+#if __FreeBSD_version > 800100
+class freebsd_atacam_device : public freebsd_ata_device
+{
+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)
+  {}
+
+protected:
+        virtual int do_cmd(struct freebsd_dev_channel* con, struct ata_ioc_request* request);
+};
+
+int freebsd_atacam_device::do_cmd(struct freebsd_dev_channel* con, 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);
+
+  // 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(con->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(con->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 fd=get_fd();
@@ -754 +845 @@
   unsigned char low,high;
 
 #ifdef IOCATAREQUEST
-  if ((retval=ioctl(con->device, IOCATAREQUEST, &request)) || request.error)
+  if ((retval=do_cmd(con, &request)) || request.error)
 #else
   if ((retval=ioctl(con->atacommand, IOCATA, &iocmd)) || request.error)
 #endif
@@ -790 +881 @@
  }
 
 #ifdef IOCATAREQUEST
- if ((retval=ioctl(con->device, IOCATAREQUEST, &request)) || request.error)
+ if ((retval=do_cmd(con, &request)) || request.error)
 #else
  if ((retval=ioctl(con->atacommand, IOCATA, &iocmd)) || request.error)
 #endif
@@ -1583 +1674 @@
 protected:
   virtual ata_device * get_ata_device(const char * name, const char * type);
 
+  virtual ata_device * get_atacam_device(const char * name, const char * type);
+
   virtual scsi_device * get_scsi_device(const char * name, const char * type);
 
   virtual smart_device * autodetect_smart_device(const char * name);
@@ -1614 +1707 @@
   return new freebsd_ata_device(this, name, type);
 }
 
+ata_device * freebsd_smart_interface::get_atacam_device(const char * name, const char * type)
+{
+  return new freebsd_atacam_device(this, name, type);
+}
+
 scsi_device * freebsd_smart_interface::get_scsi_device(const char * name, const char * type)
 {
   return new freebsd_scsi_device(this, name, type);
@@ -2176 +2274 @@
   switch (guess) {
   case CONTROLLER_ATA : 
     return new freebsd_ata_device(this, name, "");
+  case CONTROLLER_ATACAM : 
+    return new freebsd_atacam_device(this, name, "");
   case CONTROLLER_SCSI: 
     // Try to detect possible USB->(S)ATA bridge
     if (get_usb_id(name, vendor_id, product_id, version)) {

os_freebsd.h

@@ -92 +92 @@
 #endif
   char* devname;                // the SCSI device name
   int   unitnum;                // the SCSI unit number
+  struct cam_device *camdev;
 };
 
 #define FREEBSD_MAXDEV 64