| ich.c (120101) | ich.c (126695) |
|---|---|
| 1/* 2 * Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp> 3 * Copyright (c) 2001 Cameron Grant <cg@freebsd.org> 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 18 unchanged lines hidden (view full) --- 27 28#include <dev/sound/pcm/sound.h> 29#include <dev/sound/pcm/ac97.h> 30#include <dev/sound/pci/ich.h> 31 32#include <dev/pci/pcireg.h> 33#include <dev/pci/pcivar.h> 34 | 1/* 2 * Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp> 3 * Copyright (c) 2001 Cameron Grant <cg@freebsd.org> 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 18 unchanged lines hidden (view full) --- 27 28#include <dev/sound/pcm/sound.h> 29#include <dev/sound/pcm/ac97.h> 30#include <dev/sound/pci/ich.h> 31 32#include <dev/pci/pcireg.h> 33#include <dev/pci/pcivar.h> 34 |
| 35SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/ich.c 120101 2003-09-15 21:16:47Z njl $"); | 35SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/ich.c 126695 2004-03-06 15:52:42Z matk $"); |
| 36 37/* -------------------------------------------------------------------- */ 38 39#define ICH_TIMEOUT 1000 /* semaphore timeout polling count */ 40#define ICH_DTBL_LENGTH 32 41#define ICH_DEFAULT_BUFSZ 16384 42#define ICH_MAX_BUFSZ 65536 43 --- 712 unchanged lines hidden (view full) --- 756 if (pcm_register(dev, sc, 1, sc->hasmic? 2 : 1)) 757 goto bad; 758 759 pcm_addchan(dev, PCMDIR_PLAY, &ichchan_class, sc); /* play */ 760 pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record */ 761 if (sc->hasmic) 762 pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record mic */ 763 | 36 37/* -------------------------------------------------------------------- */ 38 39#define ICH_TIMEOUT 1000 /* semaphore timeout polling count */ 40#define ICH_DTBL_LENGTH 32 41#define ICH_DEFAULT_BUFSZ 16384 42#define ICH_MAX_BUFSZ 65536 43 --- 712 unchanged lines hidden (view full) --- 756 if (pcm_register(dev, sc, 1, sc->hasmic? 2 : 1)) 757 goto bad; 758 759 pcm_addchan(dev, PCMDIR_PLAY, &ichchan_class, sc); /* play */ 760 pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record */ 761 if (sc->hasmic) 762 pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record mic */ 763 |
| 764 snprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u", 765 rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz); | 764 snprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u %s", 765 rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz,PCM_KLDSTRING(snd_ich)); |
| 766 767 pcm_setstatus(dev, status); 768 769 ich_initsys(sc); 770 771 sc->intrhook.ich_func = ich_calibrate; 772 sc->intrhook.ich_arg = sc; 773 sc->use_intrhook = 1; --- 140 unchanged lines hidden --- | 766 767 pcm_setstatus(dev, status); 768 769 ich_initsys(sc); 770 771 sc->intrhook.ich_func = ich_calibrate; 772 sc->intrhook.ich_arg = sc; 773 sc->use_intrhook = 1; --- 140 unchanged lines hidden --- |