Deleted Added
full compact
maestro.c (119853) maestro.c (126695)
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 <dev/pci/pcireg.h>
50#include <dev/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 <dev/pci/pcireg.h>
50#include <dev/pci/pcivar.h>
51
52#include <dev/sound/pci/maestro_reg.h>
53
54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro.c 119853 2003-09-07 16:28:03Z cg $");
54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro.c 126695 2004-03-06 15:52:42Z matk $");
55
56#define inline __inline
57
58/*
59 * PCI IDs of supported chips:
60 *
61 * MAESTRO-1 0x01001285
62 * MAESTRO-2 0x1968125d

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

1028 if (irq == NULL || snd_setup_intr(dev, irq, 0, agg_intr, ess, &ih)) {
1029 device_printf(dev, "unable to map interrupt\n");
1030 goto bad;
1031 }
1032 ess->irq = irq;
1033 ess->irqid = irqid;
1034 ess->ih = ih;
1035
55
56#define inline __inline
57
58/*
59 * PCI IDs of supported chips:
60 *
61 * MAESTRO-1 0x01001285
62 * MAESTRO-2 0x1968125d

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

1028 if (irq == NULL || snd_setup_intr(dev, irq, 0, agg_intr, ess, &ih)) {
1029 device_printf(dev, "unable to map interrupt\n");
1030 goto bad;
1031 }
1032 ess->irq = irq;
1033 ess->irqid = irqid;
1034 ess->ih = ih;
1035
1036 snprintf(status, SND_STATUSLEN, "at I/O port 0x%lx irq %ld",
1037 rman_get_start(reg), rman_get_start(irq));
1036 snprintf(status, SND_STATUSLEN, "at I/O port 0x%lx irq %ld %s",
1037 rman_get_start(reg), rman_get_start(irq),PCM_KLDSTRING(snd_maestro));
1038
1039 if (pcm_register(dev, ess, AGG_MAXPLAYCH, 1))
1040 goto bad;
1041
1042 mixer_hwvol_init(dev);
1043 for (data = 0; data < AGG_MAXPLAYCH; data++)
1044 pcm_addchan(dev, PCMDIR_PLAY, &aggch_class, ess);
1045#if 0 /* XXX - RECORDING */

--- 150 unchanged lines hidden ---
1038
1039 if (pcm_register(dev, ess, AGG_MAXPLAYCH, 1))
1040 goto bad;
1041
1042 mixer_hwvol_init(dev);
1043 for (data = 0; data < AGG_MAXPLAYCH; data++)
1044 pcm_addchan(dev, PCMDIR_PLAY, &aggch_class, ess);
1045#if 0 /* XXX - RECORDING */

--- 150 unchanged lines hidden ---