[BACK]Return to spic.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/spic.c between version 1.11.6.2 and 1.12

version 1.11.6.2, 2008/06/02 13:23:28 version 1.12, 2008/02/29 06:17:36
Line 16 
Line 16 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
    * 3. All advertising materials mentioning features or use of this software
    *    must display the following acknowledgement:
    *        This product includes software developed by the NetBSD
    *        Foundation, Inc. and its contributors.
    * 4. Neither the name of The NetBSD Foundation nor the names of its
    *    contributors may be used to endorse or promote products derived
    *    from this software without specific prior written permission.
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS   * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Line 159  spic_intr(void *v) {
Line 166  spic_intr(void *v) {
                         goto skip;                          goto skip;
                         break;                          break;
                 default:                  default:
                         aprint_debug_dev(sc->sc_dev, "unknown lid event 0x%02x\n", v1);                          aprint_debug("%s: unknown lid event 0x%02x\n",
                               sc->sc_dev.dv_xname, v1);
                         goto skip;                          goto skip;
                         break;                          break;
                 }                  }
Line 201  spic_intr(void *v) {
Line 209  spic_intr(void *v) {
                 dz -= 0x20;                  dz -= 0x20;
                 break;                  break;
         case SPIC_EVENT_BRIGHTNESS_UP:          case SPIC_EVENT_BRIGHTNESS_UP:
                 pmf_event_inject(sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_UP);                  pmf_event_inject(&sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_UP);
                 break;                  break;
         case SPIC_EVENT_BRIGHTNESS_DOWN:          case SPIC_EVENT_BRIGHTNESS_DOWN:
                 pmf_event_inject(sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_DOWN);                  pmf_event_inject(&sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_DOWN);
                 break;                  break;
         default:          default:
                 printf("spic0: v1=0x%02x v2=0x%02x\n", v1, v2);                  printf("spic0: v1=0x%02x v2=0x%02x\n", v1, v2);
Line 268  spic_attach(struct spic_softc *sc)
Line 276  spic_attach(struct spic_softc *sc)
   
         a.accessops = &spic_accessops;          a.accessops = &spic_accessops;
         a.accesscookie = sc;          a.accesscookie = sc;
         sc->sc_wsmousedev = config_found(sc->sc_dev, &a, wsmousedevprint);          sc->sc_wsmousedev = config_found(&sc->sc_dev, &a, wsmousedevprint);
   
         sc->sc_smpsw[SPIC_PSWITCH_LID].smpsw_name = "spiclid0";          sc->sc_smpsw[SPIC_PSWITCH_LID].smpsw_name = "spiclid0";
         sc->sc_smpsw[SPIC_PSWITCH_LID].smpsw_type = PSWITCH_TYPE_LID;          sc->sc_smpsw[SPIC_PSWITCH_LID].smpsw_type = PSWITCH_TYPE_LID;
Line 280  spic_attach(struct spic_softc *sc)
Line 288  spic_attach(struct spic_softc *sc)
         for (i = 0; i < SPIC_NPSWITCH; i++) {          for (i = 0; i < SPIC_NPSWITCH; i++) {
                 rv = sysmon_pswitch_register(&sc->sc_smpsw[i]);                  rv = sysmon_pswitch_register(&sc->sc_smpsw[i]);
                 if (rv != 0)                  if (rv != 0)
                         aprint_error_dev(sc->sc_dev, "unable to register %s with sysmon\n",                          aprint_error("%s: unable to register %s with sysmon\n",
                               sc->sc_dev.dv_xname,
                             sc->sc_smpsw[i].smpsw_name);                              sc->sc_smpsw[i].smpsw_name);
         }          }
   
Legend:
Removed from v.1.11.6.2  
changed lines
  Added in v.1.12
CVSweb <webmaster@jp.NetBSD.org>