Deleted Added
full compact
hdac.c (230571) hdac.c (230807)
1/*-
2 * Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
3 * Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
4 * Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
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

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

43
44#include <dev/sound/pci/hda/hdac_private.h>
45#include <dev/sound/pci/hda/hdac_reg.h>
46#include <dev/sound/pci/hda/hda_reg.h>
47#include <dev/sound/pci/hda/hdac.h>
48
49#define HDA_DRV_TEST_REV "20120126_0002"
50
1/*-
2 * Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
3 * Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
4 * Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
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

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

43
44#include <dev/sound/pci/hda/hdac_private.h>
45#include <dev/sound/pci/hda/hdac_reg.h>
46#include <dev/sound/pci/hda/hda_reg.h>
47#include <dev/sound/pci/hda/hdac.h>
48
49#define HDA_DRV_TEST_REV "20120126_0002"
50
51SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/hda/hdac.c 230571 2012-01-26 09:45:14Z mav $");
51SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/hda/hdac.c 230807 2012-01-31 12:57:21Z mav $");
52
53#define hdac_lock(sc) snd_mtxlock((sc)->lock)
54#define hdac_unlock(sc) snd_mtxunlock((sc)->lock)
55#define hdac_lockassert(sc) snd_mtxassert((sc)->lock)
56#define hdac_lockowned(sc) mtx_owned((sc)->lock)
57
58#define HDAC_QUIRK_64BIT (1 << 0)
59#define HDAC_QUIRK_DMAPOS (1 << 1)

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

1916 HDAC_WRITE_1(&sc->mem, off + HDAC_SDCTL2, ctl);
1917
1918 HDAC_WRITE_2(&sc->mem, off + HDAC_SDFMT, sc->streams[ss].format);
1919
1920 ctl = HDAC_READ_4(&sc->mem, HDAC_INTCTL);
1921 ctl |= 1 << ss;
1922 HDAC_WRITE_4(&sc->mem, HDAC_INTCTL, ctl);
1923
52
53#define hdac_lock(sc) snd_mtxlock((sc)->lock)
54#define hdac_unlock(sc) snd_mtxunlock((sc)->lock)
55#define hdac_lockassert(sc) snd_mtxassert((sc)->lock)
56#define hdac_lockowned(sc) mtx_owned((sc)->lock)
57
58#define HDAC_QUIRK_64BIT (1 << 0)
59#define HDAC_QUIRK_DMAPOS (1 << 1)

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

1916 HDAC_WRITE_1(&sc->mem, off + HDAC_SDCTL2, ctl);
1917
1918 HDAC_WRITE_2(&sc->mem, off + HDAC_SDFMT, sc->streams[ss].format);
1919
1920 ctl = HDAC_READ_4(&sc->mem, HDAC_INTCTL);
1921 ctl |= 1 << ss;
1922 HDAC_WRITE_4(&sc->mem, HDAC_INTCTL, ctl);
1923
1924 HDAC_WRITE_1(&sc->mem, off + HDAC_SDSTS,
1925 HDAC_SDSTS_DESE | HDAC_SDSTS_FIFOE | HDAC_SDSTS_BCIS);
1924 ctl = HDAC_READ_1(&sc->mem, off + HDAC_SDCTL0);
1925 ctl |= HDAC_SDCTL_IOCE | HDAC_SDCTL_FEIE | HDAC_SDCTL_DEIE |
1926 HDAC_SDCTL_RUN;
1927 HDAC_WRITE_1(&sc->mem, off + HDAC_SDCTL0, ctl);
1928
1929 sc->streams[ss].blksz = blksz;
1930 sc->streams[ss].running = 1;
1931 hdac_poll_reinit(sc);

--- 134 unchanged lines hidden ---
1926 ctl = HDAC_READ_1(&sc->mem, off + HDAC_SDCTL0);
1927 ctl |= HDAC_SDCTL_IOCE | HDAC_SDCTL_FEIE | HDAC_SDCTL_DEIE |
1928 HDAC_SDCTL_RUN;
1929 HDAC_WRITE_1(&sc->mem, off + HDAC_SDCTL0, ctl);
1930
1931 sc->streams[ss].blksz = blksz;
1932 sc->streams[ss].running = 1;
1933 hdac_poll_reinit(sc);

--- 134 unchanged lines hidden ---