| solo.c (119853) | solo.c (126695) |
|---|---|
| 1/* 2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org> 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 19 unchanged lines hidden (view full) --- 28#include <dev/pci/pcireg.h> 29#include <dev/pci/pcivar.h> 30 31#include <dev/sound/isa/sb.h> 32#include <dev/sound/chip.h> 33 34#include "mixer_if.h" 35 | 1/* 2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org> 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 19 unchanged lines hidden (view full) --- 28#include <dev/pci/pcireg.h> 29#include <dev/pci/pcivar.h> 30 31#include <dev/sound/isa/sb.h> 32#include <dev/sound/chip.h> 33 34#include "mixer_if.h" 35 |
| 36SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/solo.c 119853 2003-09-07 16:28:03Z cg $"); | 36SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/solo.c 126695 2004-03-06 15:52:42Z matk $"); |
| 37 38#define SOLO_DEFAULT_BUFSZ 16384 39#define ABS(x) (((x) < 0)? -(x) : (x)) 40 41/* if defined, playback always uses the 2nd channel and full duplex works */ 42#undef ESS18XX_DUPLEX 43 44/* more accurate clocks and split audio1/audio2 rates */ --- 947 unchanged lines hidden (view full) --- 992 /*maxsize*/sc->bufsz, /*nsegments*/1, 993 /*maxsegz*/0x3ffff, 994 /*flags*/0, /*lockfunc*/busdma_lock_mutex, 995 /*lockarg*/&Giant, &sc->parent_dmat) != 0) { 996 device_printf(dev, "unable to create dma tag\n"); 997 goto no; 998 } 999 | 37 38#define SOLO_DEFAULT_BUFSZ 16384 39#define ABS(x) (((x) < 0)? -(x) : (x)) 40 41/* if defined, playback always uses the 2nd channel and full duplex works */ 42#undef ESS18XX_DUPLEX 43 44/* more accurate clocks and split audio1/audio2 rates */ --- 947 unchanged lines hidden (view full) --- 992 /*maxsize*/sc->bufsz, /*nsegments*/1, 993 /*maxsegz*/0x3ffff, 994 /*flags*/0, /*lockfunc*/busdma_lock_mutex, 995 /*lockarg*/&Giant, &sc->parent_dmat) != 0) { 996 device_printf(dev, "unable to create dma tag\n"); 997 goto no; 998 } 999 |
| 1000 snprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld", | 1000 snprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld %s", |
| 1001 rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc), | 1001 rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc), |
| 1002 rman_get_start(sc->irq)); | 1002 rman_get_start(sc->irq),PCM_KLDSTRING(snd_solo)); |
| 1003 1004 if (pcm_register(dev, sc, 1, 1)) 1005 goto no; 1006 pcm_addchan(dev, PCMDIR_REC, &esschan_class, sc); 1007 pcm_addchan(dev, PCMDIR_PLAY, &esschan_class, sc); 1008 pcm_setstatus(dev, status); 1009 1010 return 0; --- 44 unchanged lines hidden --- | 1003 1004 if (pcm_register(dev, sc, 1, 1)) 1005 goto no; 1006 pcm_addchan(dev, PCMDIR_REC, &esschan_class, sc); 1007 pcm_addchan(dev, PCMDIR_PLAY, &esschan_class, sc); 1008 pcm_setstatus(dev, status); 1009 1010 return 0; --- 44 unchanged lines hidden --- |