Deleted Added
full compact
ad1816.c (119853) ad1816.c (126695)
1/*
2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
3 * Copyright Luigi Rizzo, 1997,1998
4 * Copyright by Hannu Savolainen 1994, 1995
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

28
29#include <dev/sound/pcm/sound.h>
30#include <dev/sound/isa/ad1816.h>
31
32#include <isa/isavar.h>
33
34#include "mixer_if.h"
35
1/*
2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
3 * Copyright Luigi Rizzo, 1997,1998
4 * Copyright by Hannu Savolainen 1994, 1995
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

28
29#include <dev/sound/pcm/sound.h>
30#include <dev/sound/isa/ad1816.h>
31
32#include <isa/isavar.h>
33
34#include "mixer_if.h"
35
36SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/isa/ad1816.c 119853 2003-09-07 16:28:03Z cg $");
36SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/isa/ad1816.c 126695 2004-03-06 15:52:42Z matk $");
37
38struct ad1816_info;
39
40struct ad1816_chinfo {
41 struct ad1816_info *parent;
42 struct pcm_channel *channel;
43 struct snd_dbuf *buffer;
44 int dir, blksz;

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

616 device_printf(dev, "unable to create dma tag\n");
617 goto no;
618 }
619 if (ad1816->drq2)
620 snprintf(status2, SND_STATUSLEN, ":%ld", rman_get_start(ad1816->drq2));
621 else
622 status2[0] = '\0';
623
37
38struct ad1816_info;
39
40struct ad1816_chinfo {
41 struct ad1816_info *parent;
42 struct pcm_channel *channel;
43 struct snd_dbuf *buffer;
44 int dir, blksz;

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

616 device_printf(dev, "unable to create dma tag\n");
617 goto no;
618 }
619 if (ad1816->drq2)
620 snprintf(status2, SND_STATUSLEN, ":%ld", rman_get_start(ad1816->drq2));
621 else
622 status2[0] = '\0';
623
624 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
624 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s",
625 rman_get_start(ad1816->io_base),
626 rman_get_start(ad1816->irq),
627 rman_get_start(ad1816->drq1),
628 status2,
625 rman_get_start(ad1816->io_base),
626 rman_get_start(ad1816->irq),
627 rman_get_start(ad1816->drq1),
628 status2,
629 ad1816->bufsize);
629 ad1816->bufsize,
630 PCM_KLDSTRING(snd_ad1816));
630
631 if (pcm_register(dev, ad1816, 1, 1)) goto no;
632 pcm_addchan(dev, PCMDIR_REC, &ad1816chan_class, ad1816);
633 pcm_addchan(dev, PCMDIR_PLAY, &ad1816chan_class, ad1816);
634 pcm_setstatus(dev, status);
635
636 return 0;
637no:

--- 41 unchanged lines hidden ---
631
632 if (pcm_register(dev, ad1816, 1, 1)) goto no;
633 pcm_addchan(dev, PCMDIR_REC, &ad1816chan_class, ad1816);
634 pcm_addchan(dev, PCMDIR_PLAY, &ad1816chan_class, ad1816);
635 pcm_setstatus(dev, status);
636
637 return 0;
638no:

--- 41 unchanged lines hidden ---