[BACK]Return to os_linux.cpp CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / smartmontools

Diff for /embedaddon/smartmontools/os_linux.cpp between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 16:32:16 version 1.1.1.2, 2012/10/09 09:36:45
Line 5 Line 5
  *   *
  * Copyright (C) 2003-11 Bruce Allen <smartmontools-support@lists.sourceforge.net>   * Copyright (C) 2003-11 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2003-11 Doug Gilbert <dgilbert@interlog.com>   * Copyright (C) 2003-11 Doug Gilbert <dgilbert@interlog.com>
 * Copyright (C) 2008    Hank Wu <hank@areca.com.tw> * Copyright (C) 2008-12 Hank Wu <hank@areca.com.tw>
  * Copyright (C) 2008    Oliver Bock <brevilo@users.sourceforge.net>   * Copyright (C) 2008    Oliver Bock <brevilo@users.sourceforge.net>
 * Copyright (C) 2008-11 Christian Franke <smartmontools-support@lists.sourceforge.net> * Copyright (C) 2008-12 Christian Franke <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2008    Jordan Hargrave <jordan_hargrave@dell.com>   * Copyright (C) 2008    Jordan Hargrave <jordan_hargrave@dell.com>
  *   *
  *  Parts of this file are derived from code that was   *  Parts of this file are derived from code that was
Line 196  static const char  smartctl_examples[] = Line 196  static const char  smartctl_examples[] =
                   "  smartctl --all --device=hpt,1/1/3 /dev/sda\n"                    "  smartctl --all --device=hpt,1/1/3 /dev/sda\n"
                   "          (Prints all SMART info for the SATA disk attached to the 3rd PMPort\n"                    "          (Prints all SMART info for the SATA disk attached to the 3rd PMPort\n"
                   "           of the 1st channel on the 1st HighPoint RAID controller)\n"                    "           of the 1st channel on the 1st HighPoint RAID controller)\n"
                  "  smartctl --all --device=areca,3 /dev/sg2\n"                  "  smartctl --all --device=areca,3/1 /dev/sg2\n"
                  "          (Prints all SMART info for 3rd ATA disk on Areca RAID controller)\n"                  "          (Prints all SMART info for 3rd ATA disk of the 1st enclosure\n"
                   "           on Areca RAID controller)\n"
   ;    ;
   
   
Line 605  static int sg_io_cmnd_io(int dev_fd, struct scsi_cmnd_ Line 606  static int sg_io_cmnd_io(int dev_fd, struct scsi_cmnd_
         }          }
     }      }
   
    if (io_hdr.info | SG_INFO_CHECK) { /* error or warning */    if (io_hdr.info & SG_INFO_CHECK) { /* error or warning */
         int masked_driver_status = (LSCSI_DRIVER_MASK & io_hdr.driver_status);          int masked_driver_status = (LSCSI_DRIVER_MASK & io_hdr.driver_status);
   
         if (0 != io_hdr.host_status) {          if (0 != io_hdr.host_status) {
Line 1652  class linux_areca_device Line 1653  class linux_areca_device
   public /*extends*/ linux_smart_device    public /*extends*/ linux_smart_device
 {  {
 public:  public:
  linux_areca_device(smart_interface * intf, const char * dev_name, int disknum);  linux_areca_device(smart_interface * intf, const char * dev_name, int disknum, int encnum = 1);
   
 protected:  protected:
   virtual bool ata_pass_through(const ata_cmd_in & in, ata_cmd_out & out);     virtual bool ata_pass_through(const ata_cmd_in & in, ata_cmd_out & out); 
   
 private:  private:
   int m_disknum; ///< Disk number.    int m_disknum; ///< Disk number.
     int m_encnum;  ///< Enclosure number.
 };  };
   
   
Line 1964  static int arcmsr_command_handler(int fd, unsigned lon Line 1966  static int arcmsr_command_handler(int fd, unsigned lon
 }  }
   
   
linux_areca_device::linux_areca_device(smart_interface * intf, const char * dev_name, int disknum)linux_areca_device::linux_areca_device(smart_interface * intf, const char * dev_name, int disknum, int encnum)
 : smart_device(intf, dev_name, "areca", "areca"),  : smart_device(intf, dev_name, "areca", "areca"),
   linux_smart_device(O_RDWR | O_EXCL | O_NONBLOCK),    linux_smart_device(O_RDWR | O_EXCL | O_NONBLOCK),
  m_disknum(disknum)  m_disknum(disknum),
   m_encnum(encnum)
 {  {
  set_info().info_name = strprintf("%s [areca_%02d]", dev_name, disknum);  set_info().info_name = strprintf("%s [areca_disk#%02d_enc#%02d]", dev_name, disknum, encnum);
 }  }
   
 // Areca RAID Controller  // Areca RAID Controller
Line 2093  if (!ata_cmd_is_ok(in,  Line 2096  if (!ata_cmd_is_ok(in, 
             return set_err(ENOTSUP, "DATA OUT not supported for this Areca controller type");              return set_err(ENOTSUP, "DATA OUT not supported for this Areca controller type");
         }          }
   
        areca_packet[11] = m_disknum - 1;                  // drive number        areca_packet[11] = m_disknum - 1;  // disk#
         areca_packet[19] = m_encnum - 1;   // enc#
   
         // ----- BEGIN TO SETUP CHECKSUM -----          // ----- BEGIN TO SETUP CHECKSUM -----
         for ( int loop = 3; loop < areca_packet_len - 1; loop++ )          for ( int loop = 3; loop < areca_packet_len - 1; loop++ )
Line 2927  smart_device * linux_smart_interface::missing_option(c Line 2931  smart_device * linux_smart_interface::missing_option(c
   return 0;    return 0;
 }  }
   
 // Return true if STR starts with PREFIX.  
 static inline bool str_starts_with(const char * str, const char * prefix)  
 {  
   return !strncmp(str, prefix, strlen(prefix));  
 }  
   
 // Return kernel release as integer ("2.6.31" -> 206031)  // Return kernel release as integer ("2.6.31" -> 206031)
 static unsigned get_kernel_release()  static unsigned get_kernel_release()
 {  {
Line 3060  smart_device * linux_smart_interface::get_custom_smart Line 3058  smart_device * linux_smart_interface::get_custom_smart
   
   // Areca?    // Areca?
   disknum = n1 = n2 = -1;    disknum = n1 = n2 = -1;
  if (sscanf(type, "areca,%n%d%n", &n1, &disknum, &n2) == 1 || n1 == 6) {  int encnum = 1;
    if (n2 != (int)strlen(type)) {  if (sscanf(type, "areca,%n%d/%d%n", &n1, &disknum, &encnum, &n2) >= 1 || n1 == 6) {
      set_err(EINVAL, "Option -d areca,N requires N to be a non-negative integer");    if (!(1 <= disknum && disknum <= 128)) {
       set_err(EINVAL, "Option -d areca,N/E (N=%d) must have 1 <= N <= 128", disknum);
       return 0;        return 0;
     }      }
    if (!(1 <= disknum && disknum <= 24)) {    if (!(1 <= encnum && encnum <= 8)) {
      set_err(EINVAL, "Option -d areca,N (N=%d) must have 1 <= N <= 24", disknum);      set_err(EINVAL, "Option -d areca,N/E (E=%d) must have 1 <= E <= 8", encnum);
       return 0;        return 0;
     }      }
    return new linux_areca_device(this, name, disknum);    return new linux_areca_device(this, name, disknum, encnum);
   }    }
   
   // Highpoint ?    // Highpoint ?
Line 3108  smart_device * linux_smart_interface::get_custom_smart Line 3107  smart_device * linux_smart_interface::get_custom_smart
       set_err(EINVAL, "Option -d cciss,N (N=%d) must have 0 <= N <= 127", disknum);        set_err(EINVAL, "Option -d cciss,N (N=%d) must have 0 <= N <= 127", disknum);
       return 0;        return 0;
     }      }
    return new linux_cciss_device(this, name, disknum);    return get_sat_device("sat,auto", new linux_cciss_device(this, name, disknum));
   }    }
 #endif // HAVE_LINUX_CCISS_IOCTL_H  #endif // HAVE_LINUX_CCISS_IOCTL_H
   
Line 3121  smart_device * linux_smart_interface::get_custom_smart Line 3120  smart_device * linux_smart_interface::get_custom_smart
   
 std::string linux_smart_interface::get_valid_custom_dev_types_str()  std::string linux_smart_interface::get_valid_custom_dev_types_str()
 {  {
  return "marvell, areca,N, 3ware,N, hpt,L/M/N, megaraid,N"  return "marvell, areca,N/E, 3ware,N, hpt,L/M/N, megaraid,N"
 #ifdef HAVE_LINUX_CCISS_IOCTL_H  #ifdef HAVE_LINUX_CCISS_IOCTL_H
                                               ", cciss,N"                                                ", cciss,N"
 #endif  #endif
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>