ia64/xen-unstable

changeset 7931:86cf8f4e5de5

Move tpmfe.h file next to other xen specific header files.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Sat Nov 19 02:27:20 2005 +0100 (2005-11-19)
parents 04a7decd0645
children 317e5a7092e2
files linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c linux-2.6-xen-sparse/include/asm-xen/tpmfe.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Sat Nov 19 01:59:43 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Sat Nov 19 02:27:20 2005 +0100
     1.3 @@ -22,7 +22,7 @@
     1.4  
     1.5  #include <asm/uaccess.h>
     1.6  #include <linux/list.h>
     1.7 -#include <linux/tpmfe.h>
     1.8 +#include <asm-xen/tpmfe.h>
     1.9  #include <linux/device.h>
    1.10  #include <linux/interrupt.h>
    1.11  #include "tpm.h"
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Sat Nov 19 01:59:43 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Sat Nov 19 02:27:20 2005 +0100
     2.3 @@ -38,7 +38,7 @@
     2.4  #include <linux/errno.h>
     2.5  #include <linux/interrupt.h>
     2.6  #include <linux/init.h>
     2.7 -#include <linux/tpmfe.h>
     2.8 +#include <asm-xen/tpmfe.h>
     2.9  #include <linux/err.h>
    2.10  
    2.11  #include <asm/semaphore.h>
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/tpmfe.h	Sat Nov 19 02:27:20 2005 +0100
     3.3 @@ -0,0 +1,33 @@
     3.4 +#ifndef TPM_FE_H
     3.5 +#define TPM_FE_H
     3.6 +
     3.7 +struct tpmfe_device {
     3.8 +	/*
     3.9 +	 * Let upper layer receive data from front-end
    3.10 +	 */
    3.11 +	int (*receive)(const u8 *buffer, size_t count, const void *ptr);
    3.12 +	/*
    3.13 +	 * Indicate the status of the front-end to the upper
    3.14 +	 * layer.
    3.15 +	 */
    3.16 +	void (*status)(unsigned int flags);
    3.17 +
    3.18 +	/*
    3.19 +	 * This field indicates the maximum size the driver can
    3.20 +	 * transfer in one chunk. It is filled out by the front-end
    3.21 +	 * driver and should be propagated to the generic tpm driver
    3.22 +	 * for allocation of buffers.
    3.23 +	 */
    3.24 +	unsigned int max_tx_size;
    3.25 +};
    3.26 +
    3.27 +enum {
    3.28 +	TPMFE_STATUS_DISCONNECTED = 0x0,
    3.29 +	TPMFE_STATUS_CONNECTED = 0x1
    3.30 +};
    3.31 +
    3.32 +int tpm_fe_send(const u8 * buf, size_t count, void *ptr);
    3.33 +int tpm_fe_register_receiver(struct tpmfe_device *);
    3.34 +void tpm_fe_unregister_receiver(void);
    3.35 +
    3.36 +#endif
     4.1 --- a/linux-2.6-xen-sparse/include/linux/tpmfe.h	Sat Nov 19 01:59:43 2005 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,33 +0,0 @@
     4.4 -#ifndef TPM_FE_H
     4.5 -#define TPM_FE_H
     4.6 -
     4.7 -struct tpmfe_device {
     4.8 -	/*
     4.9 -	 * Let upper layer receive data from front-end
    4.10 -	 */
    4.11 -	int (*receive)(const u8 *buffer, size_t count, const void *ptr);
    4.12 -	/*
    4.13 -	 * Indicate the status of the front-end to the upper
    4.14 -	 * layer.
    4.15 -	 */
    4.16 -	void (*status)(unsigned int flags);
    4.17 -
    4.18 -	/*
    4.19 -	 * This field indicates the maximum size the driver can
    4.20 -	 * transfer in one chunk. It is filled out by the front-end
    4.21 -	 * driver and should be propagated to the generic tpm driver
    4.22 -	 * for allocation of buffers.
    4.23 -	 */
    4.24 -	unsigned int max_tx_size;
    4.25 -};
    4.26 -
    4.27 -enum {
    4.28 -	TPMFE_STATUS_DISCONNECTED = 0x0,
    4.29 -	TPMFE_STATUS_CONNECTED = 0x1
    4.30 -};
    4.31 -
    4.32 -int tpm_fe_send(const u8 * buf, size_t count, void *ptr);
    4.33 -int tpm_fe_register_receiver(struct tpmfe_device *);
    4.34 -void tpm_fe_unregister_receiver(void);
    4.35 -
    4.36 -#endif