Diff for /embedaddon/smartmontools/os_freebsd.cpp between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/22 01:17:35 version 1.1.1.4, 2013/10/14 07:54:03
Line 1827  smart_device * freebsd_smart_interface::autodetect_sma Line 1827  smart_device * freebsd_smart_interface::autodetect_sma
     for (i = 0; i < (int)scsinames.size(); i++) {      for (i = 0; i < (int)scsinames.size(); i++) {
       if(strcmp(scsinames[i].c_str(), test_name)==0)        if(strcmp(scsinames[i].c_str(), test_name)==0)
       { // our disk device is CAM        { // our disk device is CAM
           if(strncmp(scsinames[i].c_str(), "/dev/pmp", strlen("/dev/pmp")) == 0) {
             pout("Skipping port multiplier [%s]\n", scsinames[i].c_str());
             set_err(EINVAL);
             return 0;
           }
         if ((cam_dev = cam_open_device(test_name, O_RDWR)) == NULL) {          if ((cam_dev = cam_open_device(test_name, O_RDWR)) == NULL) {
           // open failure            // open failure
           set_err(errno);            set_err(errno);
Line 1923  smart_device * freebsd_smart_interface::get_custom_sma Line 1928  smart_device * freebsd_smart_interface::get_custom_sma
       set_err(EINVAL, "Option '-d hpt,L/M/N' invalid controller id L supplied");        set_err(EINVAL, "Option '-d hpt,L/M/N' invalid controller id L supplied");
       return 0;        return 0;
     }      }
    if (!(1 <= channel && channel <= 16)) {    if (!(1 <= channel && channel <= 128)) {
       set_err(EINVAL, "Option '-d hpt,L/M/N' invalid channel number M supplied");        set_err(EINVAL, "Option '-d hpt,L/M/N' invalid channel number M supplied");
       return 0;        return 0;
     }      }

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


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