Deleted Added
full compact
emu10k1.c (142890) emu10k1.c (153799)
1/*-
2 * Copyright (c) 2004 David O'Brien <obrien@FreeBSD.org>
3 * Copyright (c) 2003 Orlando Bassotto <orlando.bassotto@ieo-research.it>
4 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 21 unchanged lines hidden (view full) ---

30#include <dev/sound/pcm/ac97.h>
31#include <gnu/dev/sound/pci/emu10k1.h>
32#include "emu10k1-alsa%diked.h"
33
34#include <dev/pci/pcireg.h>
35#include <dev/pci/pcivar.h>
36#include <sys/queue.h>
37
1/*-
2 * Copyright (c) 2004 David O'Brien <obrien@FreeBSD.org>
3 * Copyright (c) 2003 Orlando Bassotto <orlando.bassotto@ieo-research.it>
4 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 21 unchanged lines hidden (view full) ---

30#include <dev/sound/pcm/ac97.h>
31#include <gnu/dev/sound/pci/emu10k1.h>
32#include "emu10k1-alsa%diked.h"
33
34#include <dev/pci/pcireg.h>
35#include <dev/pci/pcivar.h>
36#include <sys/queue.h>
37
38SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/emu10k1.c 142890 2005-03-01 08:58:06Z imp $");
38SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/emu10k1.c 153799 2005-12-28 17:57:36Z netchild $");
39
40/* -------------------------------------------------------------------- */
41
42#define NUM_G 64 /* use all channels */
43#define WAVEOUT_MAXBUFSIZE 32768
44#define EMUPAGESIZE 4096 /* don't change */
45#define EMUMAXPAGES (WAVEOUT_MAXBUFSIZE * NUM_G / EMUPAGESIZE)
46#define EMU10K1_PCI_ID 0x00021102 /* 1102 => Creative Labs Vendor ID */

--- 442 unchanged lines hidden (view full) ---

489 m->b16 = 0;
490 m->stereo = 0;
491 m->running = 0;
492 m->ismaster = 1;
493 m->vol = 0xff;
494 m->buf = tmp_addr;
495 m->slave = s;
496 if (sc->audigy) {
39
40/* -------------------------------------------------------------------- */
41
42#define NUM_G 64 /* use all channels */
43#define WAVEOUT_MAXBUFSIZE 32768
44#define EMUPAGESIZE 4096 /* don't change */
45#define EMUMAXPAGES (WAVEOUT_MAXBUFSIZE * NUM_G / EMUPAGESIZE)
46#define EMU10K1_PCI_ID 0x00021102 /* 1102 => Creative Labs Vendor ID */

--- 442 unchanged lines hidden (view full) ---

489 m->b16 = 0;
490 m->stereo = 0;
491 m->running = 0;
492 m->ismaster = 1;
493 m->vol = 0xff;
494 m->buf = tmp_addr;
495 m->slave = s;
496 if (sc->audigy) {
497 m->fxrt1 = FXBUS_MIDI_CHORUS | FXBUS_PCM_LEFT << 8 |
498 FXBUS_PCM_RIGHT << 16 | FXBUS_MIDI_REVERB << 24;
497 m->fxrt1 = FXBUS_MIDI_CHORUS | FXBUS_PCM_RIGHT << 8 |
498 FXBUS_PCM_LEFT << 16 | FXBUS_MIDI_REVERB << 24;
499 m->fxrt2 = 0x3f3f3f3f; /* No effects on second route */
500 } else {
499 m->fxrt2 = 0x3f3f3f3f; /* No effects on second route */
500 } else {
501 m->fxrt1 = FXBUS_MIDI_CHORUS | FXBUS_PCM_LEFT << 4 |
502 FXBUS_PCM_RIGHT << 8 | FXBUS_MIDI_REVERB << 12;
501 m->fxrt1 = FXBUS_MIDI_CHORUS | FXBUS_PCM_RIGHT << 4 |
502 FXBUS_PCM_LEFT << 8 | FXBUS_MIDI_REVERB << 12;
503 m->fxrt2 = 0;
504 }
505
506 if (s != NULL) {
507 s->start = m->start;
508 s->end = m->end;
509 s->channel = NULL;
510 s->speed = 0;

--- 1585 unchanged lines hidden ---
503 m->fxrt2 = 0;
504 }
505
506 if (s != NULL) {
507 s->start = m->start;
508 s->end = m->end;
509 s->channel = NULL;
510 s->speed = 0;

--- 1585 unchanged lines hidden ---