mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
firewire: adopt read cycle timer ABI from raw1394
This duplicates the read cycle timer feature of raw1394 (added in Linux 2.6.21) in firewire-core's userspace ABI. The argument to the ioctl is reordered though to ensure 32/64 bit compatibility. Signed-off-by: Stefan Richter <[email protected]> Signed-off-by: Kristian Høgsberg <[email protected]>
This commit is contained in:
parent
02ff8f8ee1
commit
a64408b96b
2 changed files with 41 additions and 0 deletions
|
|
@ -25,11 +25,14 @@
|
|||
#include <linux/device.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/preempt.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/idr.h>
|
||||
#include <linux/compat.h>
|
||||
#include <linux/firewire-cdev.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include "fw-transaction.h"
|
||||
#include "fw-topology.h"
|
||||
|
|
@ -811,6 +814,28 @@ static int ioctl_stop_iso(struct client *client, void *buffer)
|
|||
return fw_iso_context_stop(client->iso_context);
|
||||
}
|
||||
|
||||
static int ioctl_get_cycle_timer(struct client *client, void *buffer)
|
||||
{
|
||||
struct fw_cdev_get_cycle_timer *request = buffer;
|
||||
struct fw_card *card = client->device->card;
|
||||
unsigned long long bus_time;
|
||||
struct timeval tv;
|
||||
unsigned long flags;
|
||||
|
||||
preempt_disable();
|
||||
local_irq_save(flags);
|
||||
|
||||
bus_time = card->driver->get_bus_time(card);
|
||||
do_gettimeofday(&tv);
|
||||
|
||||
local_irq_restore(flags);
|
||||
preempt_enable();
|
||||
|
||||
request->local_time = tv.tv_sec * 1000000ULL + tv.tv_usec;
|
||||
request->cycle_timer = bus_time & 0xffffffff;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
|
||||
ioctl_get_info,
|
||||
ioctl_send_request,
|
||||
|
|
@ -824,6 +849,7 @@ static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
|
|||
ioctl_queue_iso,
|
||||
ioctl_start_iso,
|
||||
ioctl_stop_iso,
|
||||
ioctl_get_cycle_timer,
|
||||
};
|
||||
|
||||
static int
|
||||
|
|
|
|||
Loading…
Reference in a new issue