Deleted Added
full compact
cmi.c (122461) cmi.c (126695)
1/*
2 * Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.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

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

46
47#include <dev/pci/pcireg.h>
48#include <dev/pci/pcivar.h>
49
50#include <sys/sysctl.h>
51
52#include "mixer_if.h"
53
1/*
2 * Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.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

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

46
47#include <dev/pci/pcireg.h>
48#include <dev/pci/pcivar.h>
49
50#include <sys/sysctl.h>
51
52#include "mixer_if.h"
53
54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/cmi.c 122461 2003-11-11 05:38:28Z scottl $");
54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/cmi.c 126695 2004-03-06 15:52:42Z matk $");
55
56/* Supported chip ID's */
57#define CMI8338A_PCI_ID 0x010013f6
58#define CMI8338B_PCI_ID 0x010113f6
59#define CMI8738_PCI_ID 0x011113f6
60#define CMI8738B_PCI_ID 0x011213f6
61
62/* Buffer size max is 64k for permitted DMA boundaries */

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

893 if (pcm_register(dev, sc, 1, 1))
894 goto bad;
895
896 cmi_initsys(sc);
897
898 pcm_addchan(dev, PCMDIR_PLAY, &cmichan_class, sc);
899 pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc);
900
55
56/* Supported chip ID's */
57#define CMI8338A_PCI_ID 0x010013f6
58#define CMI8338B_PCI_ID 0x010113f6
59#define CMI8738_PCI_ID 0x011113f6
60#define CMI8738B_PCI_ID 0x011213f6
61
62/* Buffer size max is 64k for permitted DMA boundaries */

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

893 if (pcm_register(dev, sc, 1, 1))
894 goto bad;
895
896 cmi_initsys(sc);
897
898 pcm_addchan(dev, PCMDIR_PLAY, &cmichan_class, sc);
899 pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc);
900
901 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
902 rman_get_start(sc->reg), rman_get_start(sc->irq));
901 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
902 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cmi));
903 pcm_setstatus(dev, status);
904
905 DEB(printf("cmi_attach: succeeded\n"));
906 return 0;
907
908 bad:
909 if (sc->parent_dmat)
910 bus_dma_tag_destroy(sc->parent_dmat);

--- 102 unchanged lines hidden ---
903 pcm_setstatus(dev, status);
904
905 DEB(printf("cmi_attach: succeeded\n"));
906 return 0;
907
908 bad:
909 if (sc->parent_dmat)
910 bus_dma_tag_destroy(sc->parent_dmat);

--- 102 unchanged lines hidden ---