From: Jan Kiszka <jan.kiszka@domain.hid>
To: Xenomai-core@domain.hid
Subject: [Xenomai-core] [PATCH 4/5] Cleanup tickdev emulation after I-pipe refactorings
Date: Tue, 13 Nov 2007 00:01:05 +0100 [thread overview]
Message-ID: <4738DB31.9080405@domain.hid> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 165 bytes --]
A separately posted I-pipe patch refactors the tickdev emulation API.
This patch updates Xenomai to the new prototypes without changing any
functionality.
Jan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: cleanup-tickdev-emu.patch --]
[-- Type: text/x-patch; name="cleanup-tickdev-emu.patch", Size: 5702 bytes --]
---
include/asm-generic/bits/pod.h | 14 +++++++-------
include/asm-generic/hal.h | 6 +++---
ksrc/arch/generic/hal.c | 4 ++--
ksrc/arch/x86/hal-shared.c | 6 +++---
ksrc/arch/x86/hal_32.c | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
Index: xenomai/include/asm-generic/bits/pod.h
===================================================================
--- xenomai.orig/include/asm-generic/bits/pod.h
+++ xenomai/include/asm-generic/bits/pod.h
@@ -31,7 +31,7 @@
/*!
* @internal
- * \fn void xnarch_next_htick_shot(unsigned long delay, struct ipipe_tick_device *tdev)
+ * \fn void xnarch_next_htick_shot(unsigned long delay, struct clock_event_device *cdev)
*
* \brief Next tick setup emulation callback.
*
@@ -42,7 +42,7 @@
* @param delay The time delta from the current date to the next tick,
* expressed as a count of nanoseconds.
*
- * @param tdev An pointer to the tick device which notifies us.
+ * @param cdev An pointer to the clock device which notifies us.
*
* Environment:
*
@@ -58,7 +58,7 @@
* Rescheduling: never.
*/
-static int xnarch_next_htick_shot(unsigned long delay, struct ipipe_tick_device *tdev)
+static int xnarch_next_htick_shot(unsigned long delay, struct clock_event_device *cdev)
{
xnsched_t *sched;
spl_t s;
@@ -73,7 +73,7 @@ static int xnarch_next_htick_shot(unsign
/*!
* @internal
- * \fn void xnarch_switch_htick_mode(enum clock_event_mode mode, struct ipipe_tick_device *tdev)
+ * \fn void xnarch_switch_htick_mode(enum clock_event_mode mode, struct clock_event_device *cdev)
*
* \brief Tick mode switch emulation callback.
*
@@ -94,7 +94,7 @@ static int xnarch_next_htick_shot(unsign
* which should never be shut down, so this mode should not be
* encountered.
*
- * @param tdev An opaque pointer to the tick device which notifies us.
+ * @param cdev An opaque pointer to the clock device which notifies us.
*
* Environment:
*
@@ -109,13 +109,13 @@ static int xnarch_next_htick_shot(unsign
* Rescheduling: never.
*/
-static void xnarch_switch_htick_mode(enum clock_event_mode mode, struct ipipe_tick_device *tdev)
+static void xnarch_switch_htick_mode(enum clock_event_mode mode, struct clock_event_device *cdev)
{
xnsched_t *sched;
xnticks_t tickval;
spl_t s;
- rthal_timer_notify_switch(mode, tdev);
+ rthal_timer_notify_switch(mode, cdev);
if (mode == CLOCK_EVT_MODE_ONESHOT)
return;
Index: xenomai/include/asm-generic/hal.h
===================================================================
--- xenomai.orig/include/asm-generic/hal.h
+++ xenomai/include/asm-generic/hal.h
@@ -440,12 +440,12 @@ unsigned long rthal_timer_calibrate(void
#ifdef CONFIG_GENERIC_CLOCKEVENTS
int rthal_timer_request(void (*tick_handler)(void),
- void (*mode_emul)(enum clock_event_mode mode, struct ipipe_tick_device *tdev),
- int (*tick_emul) (unsigned long delay, struct ipipe_tick_device *tdev),
+ void (*mode_emul)(enum clock_event_mode mode, struct clock_event_device *cdev),
+ int (*tick_emul) (unsigned long delay, struct clock_event_device *cdev),
int cpu);
void rthal_timer_notify_switch(enum clock_event_mode mode,
- struct ipipe_tick_device *tdev);
+ struct clock_event_device *cdev);
#else
int rthal_timer_request(void (*tick_handler)(void),
Index: xenomai/ksrc/arch/generic/hal.c
===================================================================
--- xenomai.orig/ksrc/arch/generic/hal.c
+++ xenomai/ksrc/arch/generic/hal.c
@@ -985,8 +985,8 @@ unsigned long long __rthal_generic_full_
/**
* \fn int rthal_timer_request(void (*tick_handler)(void),
- * void (*mode_emul)(enum clock_event_mode mode, struct ipipe_tick_device *tdev),
- * int (*tick_emul)(unsigned long delay, struct ipipe_tick_device *tdev), int cpu)
+ * void (*mode_emul)(enum clock_event_mode mode, struct clock_event_device *cdev),
+ * int (*tick_emul)(unsigned long delay, struct clock_event_device *cdev), int cpu)
* \brief Grab the hardware timer.
*
* rthal_timer_request() grabs and tunes the hardware timer in oneshot
Index: xenomai/ksrc/arch/x86/hal-shared.c
===================================================================
--- xenomai.orig/ksrc/arch/x86/hal-shared.c
+++ xenomai/ksrc/arch/x86/hal-shared.c
@@ -121,9 +121,9 @@ int rthal_timer_request(
void (*tick_handler)(void),
#ifdef CONFIG_GENERIC_CLOCKEVENTS
void (*mode_emul)(enum clock_event_mode mode,
- struct ipipe_tick_device *tdev),
+ struct clock_event_device *cdev),
int (*tick_emul)(unsigned long delay,
- struct ipipe_tick_device *tdev),
+ struct clock_event_device *cdev),
#endif
int cpu)
{
@@ -238,7 +238,7 @@ void rthal_timer_release(int cpu)
#ifdef CONFIG_GENERIC_CLOCKEVENTS
void rthal_timer_notify_switch(enum clock_event_mode mode,
- struct ipipe_tick_device *tdev)
+ struct clock_event_device *cdev)
{
if (rthal_processor_id() > 0)
/*
Index: xenomai/ksrc/arch/x86/hal_32.c
===================================================================
--- xenomai.orig/ksrc/arch/x86/hal_32.c
+++ xenomai/ksrc/arch/x86/hal_32.c
@@ -231,9 +231,9 @@ int rthal_timer_request(
void (*tick_handler)(void),
#ifdef CONFIG_GENERIC_CLOCKEVENTS
void (*mode_emul)(enum clock_event_mode mode,
- struct ipipe_tick_device *tdev),
+ struct clock_event_device *cdev),
int (*tick_emul)(unsigned long delay,
- struct ipipe_tick_device *tdev),
+ struct clock_event_device *cdev),
#endif
int cpu)
{
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]
reply other threads:[~2007-11-12 23:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4738DB31.9080405@domain.hid \
--to=jan.kiszka@domain.hid \
--cc=Xenomai-core@domain.hid \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.