[BACK]Return to nslm7x.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / dev / ic

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/dev/ic/nslm7x.c between version 1.22.2.6 and 1.22.2.7

version 1.22.2.6, 2008/02/11 14:59:33 version 1.22.2.7, 2008/03/17 09:14:43
Line 1696  lm_attach(struct lm_softc *lmsc)
Line 1696  lm_attach(struct lm_softc *lmsc)
         /*          /*
          * Hook into the System Monitor.           * Hook into the System Monitor.
          */           */
         lmsc->sc_sme->sme_name = lmsc->sc_dev.dv_xname;          lmsc->sc_sme->sme_name = device_xname(lmsc->sc_dev);
         lmsc->sc_sme->sme_flags = SME_DISABLE_REFRESH;          lmsc->sc_sme->sme_flags = SME_DISABLE_REFRESH;
   
         if (sysmon_envsys_register(lmsc->sc_sme)) {          if (sysmon_envsys_register(lmsc->sc_sme)) {
                 aprint_error("%s: unable to register with sysmon\n",                  aprint_error_dev(lmsc->sc_dev,
                     lmsc->sc_dev.dv_xname);                      "unable to register with sysmon\n");
                 sysmon_envsys_destroy(lmsc->sc_sme);                  sysmon_envsys_destroy(lmsc->sc_sme);
         }          }
 }  }
Line 1753  lm_match(struct lm_softc *sc)
Line 1753  lm_match(struct lm_softc *sc)
         }          }
   
         aprint_normal("\n");          aprint_normal("\n");
         aprint_normal("%s: National Semiconductor %s Hardware monitor\n",          aprint_normal_dev(sc->sc_dev,
             sc->sc_dev.dv_xname, model);              "National Semiconductor %s Hardware monitor\n", model);
   
         lm_setup_sensors(sc, lm78_sensors);          lm_setup_sensors(sc, lm78_sensors);
         sc->refresh_sensor_data = lm_refresh_sensor_data;          sc->refresh_sensor_data = lm_refresh_sensor_data;
Line 1768  def_match(struct lm_softc *sc)
Line 1768  def_match(struct lm_softc *sc)
   
         chipid = (*sc->lm_readreg)(sc, LMD_CHIPID) & LM_ID_MASK;          chipid = (*sc->lm_readreg)(sc, LMD_CHIPID) & LM_ID_MASK;
         aprint_normal("\n");          aprint_normal("\n");
         aprint_error("%s: Unknown chip (ID %d)\n", sc->sc_dev.dv_xname,          aprint_error_dev(sc->sc_dev, "Unknown chip (ID %d)\n", chipid);
             chipid);  
   
         lm_setup_sensors(sc, lm78_sensors);          lm_setup_sensors(sc, lm78_sensors);
         sc->refresh_sensor_data = lm_refresh_sensor_data;          sc->refresh_sensor_data = lm_refresh_sensor_data;
Line 1867  wb_match(struct lm_softc *sc)
Line 1866  wb_match(struct lm_softc *sc)
                 }                  }
                 break;                  break;
         default:          default:
                 aprint_normal("%s: unknown Winbond chip (ID 0x%x)\n",                  aprint_normal_dev(sc->sc_dev,
                     sc->sc_dev.dv_xname, sc->chipid);                      "unknown Winbond chip (ID 0x%x)\n", sc->chipid);
                 /* Handle as a standard LM78. */                  /* Handle as a standard LM78. */
                 lm_setup_sensors(sc, lm78_sensors);                  lm_setup_sensors(sc, lm78_sensors);
                 sc->refresh_sensor_data = lm_refresh_sensor_data;                  sc->refresh_sensor_data = lm_refresh_sensor_data;
                 return 1;                  return 1;
         }          }
   
         aprint_normal("%s: Winbond %s Hardware monitor\n",          aprint_normal_dev(sc->sc_dev, "Winbond %s Hardware monitor\n", model);
             sc->sc_dev.dv_xname, model);  
   
         sc->refresh_sensor_data = wb_refresh_sensor_data;          sc->refresh_sensor_data = wb_refresh_sensor_data;
         return 1;          return 1;
Legend:
Removed from v.1.22.2.6  
changed lines
  Added in v.1.22.2.7
CVSweb <webmaster@jp.NetBSD.org>