Deleted Added
full compact
maestro.c (94814) maestro.c (107285)
1/*-
2 * Copyright (c) 2000 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
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

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

46
47#include <dev/sound/pcm/sound.h>
48#include <dev/sound/pcm/ac97.h>
49#include <pci/pcireg.h>
50#include <pci/pcivar.h>
51
52#include <dev/sound/pci/maestro_reg.h>
53
1/*-
2 * Copyright (c) 2000 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
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

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

46
47#include <dev/sound/pcm/sound.h>
48#include <dev/sound/pcm/ac97.h>
49#include <pci/pcireg.h>
50#include <pci/pcivar.h>
51
52#include <dev/sound/pci/maestro_reg.h>
53
54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro.c 94814 2002-04-16 01:58:13Z jhb $");
54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro.c 107285 2002-11-26 18:16:27Z cg $");
55
56#define inline __inline
57
58/*
59 * PCI IDs of supported chips:
60 *
61 * MAESTRO-1 0x01001285
62 * MAESTRO-2 0x1968125d

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

105 struct resource *irq;
106 int irqid;
107 void *ih;
108
109 u_int8_t *stat;
110 bus_addr_t baseaddr;
111
112 struct ac97_info *codec;
55
56#define inline __inline
57
58/*
59 * PCI IDs of supported chips:
60 *
61 * MAESTRO-1 0x01001285
62 * MAESTRO-2 0x1968125d

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

105 struct resource *irq;
106 int irqid;
107 void *ih;
108
109 u_int8_t *stat;
110 bus_addr_t baseaddr;
111
112 struct ac97_info *codec;
113 void *lock;
113 struct mtx *lock;
114
115 unsigned int bufsz;
116 u_int playchns, active;
117 struct agg_chinfo pch[AGG_MAXPLAYCH];
118 struct agg_chinfo rch;
119};
120
121static inline void ringbus_setdest(struct agg_info*, int, int);

--- 1073 unchanged lines hidden ---
114
115 unsigned int bufsz;
116 u_int playchns, active;
117 struct agg_chinfo pch[AGG_MAXPLAYCH];
118 struct agg_chinfo rch;
119};
120
121static inline void ringbus_setdest(struct agg_info*, int, int);

--- 1073 unchanged lines hidden ---