lkml.org 
[lkml]   [2006]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] hpet header sanitization
    From: Randy Dunlap <rdunlap@xenotime.net>

    Add __KERNEL__ block.
    Use __KERNEL__ to allow ioctl interface to be usable.

    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    ---
    include/linux/hpet.h | 36 ++++++++++++++++++++----------------
    1 files changed, 20 insertions(+), 16 deletions(-)

    --- linux-2616-work.orig/include/linux/hpet.h
    +++ linux-2616-work/include/linux/hpet.h
    @@ -3,6 +3,8 @@

    #include <linux/compiler.h>

    +#ifdef __KERNEL__
    +
    /*
    * Offsets into HPET Registers
    */
    @@ -85,22 +87,6 @@ struct hpet {
    #define Tn_FSB_INT_ADDR_SHIFT (32UL)
    #define Tn_FSB_INT_VAL_MASK (0x00000000ffffffffULL)

    -struct hpet_info {
    - unsigned long hi_ireqfreq; /* Hz */
    - unsigned long hi_flags; /* information */
    - unsigned short hi_hpet;
    - unsigned short hi_timer;
    -};
    -
    -#define HPET_INFO_PERIODIC 0x0001 /* timer is periodic */
    -
    -#define HPET_IE_ON _IO('h', 0x01) /* interrupt on */
    -#define HPET_IE_OFF _IO('h', 0x02) /* interrupt off */
    -#define HPET_INFO _IOR('h', 0x03, struct hpet_info)
    -#define HPET_EPI _IO('h', 0x04) /* enable periodic */
    -#define HPET_DPI _IO('h', 0x05) /* disable periodic */
    -#define HPET_IRQFREQ _IOW('h', 0x6, unsigned long) /* IRQFREQ usec */
    -
    /*
    * exported interfaces
    */
    @@ -133,4 +119,22 @@ int hpet_register(struct hpet_task *, in
    int hpet_unregister(struct hpet_task *);
    int hpet_control(struct hpet_task *, unsigned int, unsigned long);

    +#endif /* __KERNEL__ */
    +
    +struct hpet_info {
    + unsigned long hi_ireqfreq; /* Hz */
    + unsigned long hi_flags; /* information */
    + unsigned short hi_hpet;
    + unsigned short hi_timer;
    +};
    +
    +#define HPET_INFO_PERIODIC 0x0001 /* timer is periodic */
    +
    +#define HPET_IE_ON _IO('h', 0x01) /* interrupt on */
    +#define HPET_IE_OFF _IO('h', 0x02) /* interrupt off */
    +#define HPET_INFO _IOR('h', 0x03, struct hpet_info)
    +#define HPET_EPI _IO('h', 0x04) /* enable periodic */
    +#define HPET_DPI _IO('h', 0x05) /* disable periodic */
    +#define HPET_IRQFREQ _IOW('h', 0x6, unsigned long) /* IRQFREQ usec */
    +
    #endif /* !__HPET__ */

    ---
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-03-21 23:46    [W:0.024 / U:180.756 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site