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

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

Diff for /src/sys/dev/isa/itesio_isa.c between version 1.18 and 1.19

version 1.18, 2010/05/02 18:49:13 version 1.19, 2010/07/17 21:36:26
Line 92  static void itesio_refresh_fans(struct i
Line 92  static void itesio_refresh_fans(struct i
 static void     itesio_refresh(struct sysmon_envsys *, envsys_data_t *);  static void     itesio_refresh(struct sysmon_envsys *, envsys_data_t *);
   
 /* sysmon_wdog glue */  /* sysmon_wdog glue */
   static bool     itesio_wdt_suspend(device_t, const pmf_qual_t *);
 static int      itesio_wdt_setmode(struct sysmon_wdog *);  static int      itesio_wdt_setmode(struct sysmon_wdog *);
 static int      itesio_wdt_tickle(struct sysmon_wdog *);  static int      itesio_wdt_tickle(struct sysmon_wdog *);
   
Line 250  itesio_isa_attach(device_t parent, devic
Line 251  itesio_isa_attach(device_t parent, devic
         }          }
         sc->sc_hwmon_enabled = true;          sc->sc_hwmon_enabled = true;
   
         if (!pmf_device_register(self, NULL, NULL))  
                 aprint_error_dev(self, "couldn't establish power handler\n");  
   
         /* The IT8705 doesn't support the WDT */          /* The IT8705 doesn't support the WDT */
         if (sc->sc_chipid == ITESIO_ID8705)          if (sc->sc_chipid == ITESIO_ID8705)
                 goto out2;                  goto out2;
Line 272  itesio_isa_attach(device_t parent, devic
Line 270  itesio_isa_attach(device_t parent, devic
         }          }
         sc->sc_wdt_enabled = true;          sc->sc_wdt_enabled = true;
         aprint_normal_dev(self, "Watchdog Timer present\n");          aprint_normal_dev(self, "Watchdog Timer present\n");
   
           if (!pmf_device_register(self, itesio_wdt_suspend, NULL))
                   aprint_error_dev(self, "couldn't establish power handler\n");
   
         return;          return;
   
 out:  out:
         bus_space_unmap(sc->sc_iot, sc->sc_ec_ioh, 8);          bus_space_unmap(sc->sc_iot, sc->sc_ec_ioh, 8);
 out2:  out2:
         bus_space_unmap(sc->sc_iot, sc->sc_pnp_ioh, 2);          bus_space_unmap(sc->sc_iot, sc->sc_pnp_ioh, 2);
   
           if (!pmf_device_register(self, NULL, NULL))
                   aprint_error_dev(self, "couldn't establish power handler\n");
   
 }  }
   
 static int  static int
Line 297  itesio_isa_detach(device_t self, int fla
Line 303  itesio_isa_detach(device_t self, int fla
         return 0;          return 0;
 }  }
   
   static bool
   itesio_wdt_suspend(device_t dev, const pmf_qual_t *qual)
   {
           struct itesio_softc *sc = device_private(dev);
   
           /* Don't allow suspend if watchdog is armed */
           if ((sc->sc_smw.smw_mode & WDOG_MODE_MASK) != WDOG_MODE_DISARMED)
                   return false;
           return true;
   }
   
 /*  /*
  * Functions to read/write to the Environmental Controller.   * Functions to read/write to the Environmental Controller.
  */   */

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

CVSweb <webmaster@jp.NetBSD.org>