Deleted Added
full compact
als4000.c (119690) als4000.c (126695)
1/*
2 * Copyright (c) 2001 Orion Hodson <oho@acm.org>
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

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

37#include <dev/sound/isa/sb.h>
38#include <dev/sound/pci/als4000.h>
39
40#include <dev/pci/pcireg.h>
41#include <dev/pci/pcivar.h>
42
43#include "mixer_if.h"
44
1/*
2 * Copyright (c) 2001 Orion Hodson <oho@acm.org>
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

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

37#include <dev/sound/isa/sb.h>
38#include <dev/sound/pci/als4000.h>
39
40#include <dev/pci/pcireg.h>
41#include <dev/pci/pcivar.h>
42
43#include "mixer_if.h"
44
45SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/als4000.c 119690 2003-09-02 17:30:40Z jhb $");
45SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/als4000.c 126695 2004-03-06 15:52:42Z matk $");
46
47/* Debugging macro's */
48#undef DEB
49#ifndef DEB
50#define DEB(x) /* x */
51#endif /* DEB */
52
53#define ALS_DEFAULT_BUFSZ 16384

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

813 if (pcm_register(dev, sc, 1, 1)) {
814 device_printf(dev, "failed to register pcm entries\n");
815 goto bad_attach;
816 }
817
818 pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc);
819 pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc);
820
46
47/* Debugging macro's */
48#undef DEB
49#ifndef DEB
50#define DEB(x) /* x */
51#endif /* DEB */
52
53#define ALS_DEFAULT_BUFSZ 16384

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

813 if (pcm_register(dev, sc, 1, 1)) {
814 device_printf(dev, "failed to register pcm entries\n");
815 goto bad_attach;
816 }
817
818 pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc);
819 pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc);
820
821 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
822 rman_get_start(sc->reg), rman_get_start(sc->irq));
821 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
822 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_als4000));
823 pcm_setstatus(dev, status);
824 return 0;
825
826 bad_attach:
827 als_resource_free(dev, sc);
828 free(sc, M_DEVBUF);
829 return ENXIO;
830}

--- 73 unchanged lines hidden ---
823 pcm_setstatus(dev, status);
824 return 0;
825
826 bad_attach:
827 als_resource_free(dev, sc);
828 free(sc, M_DEVBUF);
829 return ENXIO;
830}

--- 73 unchanged lines hidden ---