Diff for /src/sys/dev/sound/isa/i386/spkr/Attic/spkr.c between versions 1.4 and 1.5

version 1.4, 2003/07/06 21:23:49 version 1.5, 2003/07/19 21:14:34
Line 5 Line 5
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>   * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *   *
  * $FreeBSD: src/sys/i386/isa/spkr.c,v 1.45 2000/01/29 16:00:32 peter Exp $   * $FreeBSD: src/sys/i386/isa/spkr.c,v 1.45 2000/01/29 16:00:32 peter Exp $
 * $DragonFly: src/sys/i386/isa/spkr.c,v 1.3 2003/06/23 17:55:39 dillon Exp $ * $DragonFly$
  */   */
   
 #include <sys/param.h>  #include <sys/param.h>
Line 62  static struct cdevsw spkr_cdevsw = { Line 62  static struct cdevsw spkr_cdevsw = {
  */   */
 #define PPI_SPKR        0x03    /* turn these PPI bits on to pass sound */  #define PPI_SPKR        0x03    /* turn these PPI bits on to pass sound */
   
 #define SPKRPRI PSOCK  
 static char endtone, endrest;  static char endtone, endrest;
   
 static void tone __P((unsigned int thz, unsigned int ticks));  static void tone __P((unsigned int thz, unsigned int ticks));
Line 112  tone(thz, ticks) Line 111  tone(thz, ticks)
      * emitted.       * emitted.
      */       */
     if (ticks > 0)      if (ticks > 0)
        tsleep((caddr_t)&endtone, SPKRPRI | PCATCH, "spkrtn", ticks);        tsleep((caddr_t)&endtone, PCATCH, "spkrtn", ticks);
     outb(IO_PPI, inb(IO_PPI) & ~PPI_SPKR);      outb(IO_PPI, inb(IO_PPI) & ~PPI_SPKR);
     sps = splclock();      sps = splclock();
     release_timer2();      release_timer2();
Line 133  rest(ticks) Line 132  rest(ticks)
     (void) printf("rest: %d\n", ticks);      (void) printf("rest: %d\n", ticks);
 #endif /* DEBUG */  #endif /* DEBUG */
     if (ticks > 0)      if (ticks > 0)
        tsleep((caddr_t)&endrest, SPKRPRI | PCATCH, "spkrrs", ticks);        tsleep((caddr_t)&endrest, PCATCH, "spkrrs", ticks);
 }  }
   
 /**************** PLAY STRING INTERPRETER BEGINS HERE **********************  /**************** PLAY STRING INTERPRETER BEGINS HERE **********************

Removed from v.1.4  
changed lines
  Added in v.1.5