Deleted Added
full compact
emu10k1.c (107236) emu10k1.c (107285)
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

27#include <dev/sound/pcm/sound.h>
28#include <dev/sound/pcm/ac97.h>
29#include <gnu/dev/sound/pci/emu10k1.h>
30
31#include <pci/pcireg.h>
32#include <pci/pcivar.h>
33#include <sys/queue.h>
34
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

27#include <dev/sound/pcm/sound.h>
28#include <dev/sound/pcm/ac97.h>
29#include <gnu/dev/sound/pci/emu10k1.h>
30
31#include <pci/pcireg.h>
32#include <pci/pcivar.h>
33#include <sys/queue.h>
34
35SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/emu10k1.c 107236 2002-11-25 17:07:33Z cg $");
35SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/emu10k1.c 107285 2002-11-26 18:16:27Z cg $");
36
37/* -------------------------------------------------------------------- */
38
39#define EMU10K1_PCI_ID 0x00021102
40#define EMU10K2_PCI_ID 0x00041102
41#define EMU_DEFAULT_BUFSZ 4096
42#define EMU_CHANS 4
43#undef EMUDEBUG

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

91 u_int32_t tos_link:1, APS:1;
92
93 bus_space_tag_t st;
94 bus_space_handle_t sh;
95 bus_dma_tag_t parent_dmat;
96
97 struct resource *reg, *irq;
98 void *ih;
36
37/* -------------------------------------------------------------------- */
38
39#define EMU10K1_PCI_ID 0x00021102
40#define EMU10K2_PCI_ID 0x00041102
41#define EMU_DEFAULT_BUFSZ 4096
42#define EMU_CHANS 4
43#undef EMUDEBUG

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

91 u_int32_t tos_link:1, APS:1;
92
93 bus_space_tag_t st;
94 bus_space_handle_t sh;
95 bus_dma_tag_t parent_dmat;
96
97 struct resource *reg, *irq;
98 void *ih;
99 void *lock;
99 struct mtx *lock;
100
101 unsigned int bufsz;
102 int timer, timerinterval;
103 int pnum, rnum;
104 struct emu_mem mem;
105 struct emu_voice voice[64];
106 struct sc_pchinfo pch[EMU_CHANS];
107 struct sc_rchinfo rch[3];

--- 1521 unchanged lines hidden ---
100
101 unsigned int bufsz;
102 int timer, timerinterval;
103 int pnum, rnum;
104 struct emu_mem mem;
105 struct emu_voice voice[64];
106 struct sc_pchinfo pch[EMU_CHANS];
107 struct sc_rchinfo rch[3];

--- 1521 unchanged lines hidden ---