mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 13:41:51 +00:00
612262a533
Combination of the following changes:
Tue, 26 Aug 2008 00:17:30 +0200 (CEST)
firedtv: fix remote control input
and update the scancode-to-keycode mapping to a current model. Per
default, various media key keycodes are emitted which closely match what
is printed on the remote. Userland can modify the mapping by means of
evdev ioctls. (Not tested.)
The old scancode-to-keycode mapping is left in the driver but cannot be
modified by ioctls. This preserves status quo for old remotes.
Tue, 26 Aug 2008 00:11:28 +0200 (CEST)
firedtv: replace tasklet by workqueue job
Non-atomic context is a lot nicer to work with.
Sun, 24 Aug 2008 23:30:00 +0200 (CEST)
firedtv: move some code back to ieee1394 core
Partially reverts "ieee1394: remove unused code" of Linux 2.6.25.
Sun, 24 Aug 2008 23:29:30 +0200 (CEST)
firedtv: replace semaphore by mutex
firesat->avc_sem and ->demux_sem have been used exactly like a mutex.
The only exception is the schedule_remotecontrol tasklet which did a
down_trylock in atomic context. This is not possible with
mutex_trylock; however the whole remote control related code is
non-functional anyway at the moment. This should be fixed eventually,
probably by turning the tasklet into a worqueue job.
Convert everything else from semaphore to mutex.
Also rewrite a few of the affected functions to unlock the mutex at a
single exit point, instead of in several branches.
Sun, 24 Aug 2008 23:28:45 +0200 (CEST)
firedtv: some header cleanups
Unify #ifndef/#define/#endif guards against multiple inclusion.
Drop extern keyword from function declarations.
Remove #include's into header files where struct declarations suffice.
Remove unused ohci1394 interface and related unused ieee1394 interfaces.
Add a few missing #include's and remove a few apparently obsolete ones.
Sort them alphabetically.
Sun, 24 Aug 2008 23:27:45 +0200 (CEST)
firedtv: nicer registration message and some initialization fixes
Print the correct name in dvb_register_adapter().
While we are at it, replace two switch cascades by one for loop, remove
a superfluous member of struct firesat and of two unused arguments of
AVCIdentifySubunit(), and fix bogus kfree's in firesat_dvbdev_init().
Tue, 26 Aug 2008 14:24:17 +0200 (CEST)
firesat: rename to firedtv
Suggested by Andreas Monitzer. Besides DVB-S/-S2 receivers, the driver
also supports DVB-C and DVB-T receivers, hence the previous project name
is too narrow now.
Not yet done: Rename source directory, files, types, variables...
Sun, 24 Aug 2008 23:26:23 +0200 (CEST)
firesat: add missing copyright notes
Reported by Andreas Monitzer and Christian Dolzer.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
90 lines
2.5 KiB
C
90 lines
2.5 KiB
C
/*
|
|
* DMA region bookkeeping routines
|
|
*
|
|
* Copyright (C) 2002 Maas Digital LLC
|
|
*
|
|
* This code is licensed under the GPL. See the file COPYING in the root
|
|
* directory of the kernel sources for details.
|
|
*/
|
|
|
|
#ifndef IEEE1394_DMA_H
|
|
#define IEEE1394_DMA_H
|
|
|
|
#include <asm/types.h>
|
|
|
|
struct file;
|
|
struct pci_dev;
|
|
struct scatterlist;
|
|
struct vm_area_struct;
|
|
|
|
/**
|
|
* struct dma_prog_region - small contiguous DMA buffer
|
|
* @kvirt: kernel virtual address
|
|
* @dev: PCI device
|
|
* @n_pages: number of kernel pages
|
|
* @bus_addr: base bus address
|
|
*
|
|
* a small, physically contiguous DMA buffer with random-access, synchronous
|
|
* usage characteristics
|
|
*/
|
|
struct dma_prog_region {
|
|
unsigned char *kvirt;
|
|
struct pci_dev *dev;
|
|
unsigned int n_pages;
|
|
dma_addr_t bus_addr;
|
|
};
|
|
|
|
/* clear out all fields but do not allocate any memory */
|
|
void dma_prog_region_init(struct dma_prog_region *prog);
|
|
int dma_prog_region_alloc(struct dma_prog_region *prog, unsigned long n_bytes,
|
|
struct pci_dev *dev);
|
|
void dma_prog_region_free(struct dma_prog_region *prog);
|
|
|
|
static inline dma_addr_t dma_prog_region_offset_to_bus(
|
|
struct dma_prog_region *prog, unsigned long offset)
|
|
{
|
|
return prog->bus_addr + offset;
|
|
}
|
|
|
|
/**
|
|
* struct dma_region - large non-contiguous DMA buffer
|
|
* @virt: kernel virtual address
|
|
* @dev: PCI device
|
|
* @n_pages: number of kernel pages
|
|
* @n_dma_pages: number of IOMMU pages
|
|
* @sglist: IOMMU mapping
|
|
* @direction: PCI_DMA_TODEVICE, etc.
|
|
*
|
|
* a large, non-physically-contiguous DMA buffer with streaming, asynchronous
|
|
* usage characteristics
|
|
*/
|
|
struct dma_region {
|
|
unsigned char *kvirt;
|
|
struct pci_dev *dev;
|
|
unsigned int n_pages;
|
|
unsigned int n_dma_pages;
|
|
struct scatterlist *sglist;
|
|
int direction;
|
|
};
|
|
|
|
void dma_region_init(struct dma_region *dma);
|
|
int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,
|
|
struct pci_dev *dev, int direction);
|
|
void dma_region_free(struct dma_region *dma);
|
|
void dma_region_sync_for_cpu(struct dma_region *dma, unsigned long offset,
|
|
unsigned long len);
|
|
void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset,
|
|
unsigned long len);
|
|
int dma_region_mmap(struct dma_region *dma, struct file *file,
|
|
struct vm_area_struct *vma);
|
|
dma_addr_t dma_region_offset_to_bus(struct dma_region *dma,
|
|
unsigned long offset);
|
|
|
|
/**
|
|
* dma_region_i - macro to index into a DMA region (or dma_prog_region)
|
|
*/
|
|
#define dma_region_i(_dma, _type, _index) \
|
|
( ((_type*) ((_dma)->kvirt)) + (_index) )
|
|
|
|
#endif /* IEEE1394_DMA_H */
|