arm: msm: smd: checkpatch clean up of smd/proc_comm

[safe/jmp/linux-2.6] / arch / arm / mach-msm / smd_private.h

diff --git a/arch/arm/mach-msm/smd_private.h b/arch/arm/mach-msm/smd_private.h
index 35e0835..33a33f1 100644 (file)
--- a/arch/arm/mach-msm/smd_private.h
+++ b/arch/arm/mach-msm/smd_private.h
@@ -16,24 +16,25 @@
 #ifndef _ARCH_ARM_MACH_MSM_MSM_SMD_PRIVATE_H_
 #define _ARCH_ARM_MACH_MSM_MSM_SMD_PRIVATE_H_
 
-struct smem_heap_info
-{
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
+
+struct smem_heap_info {
        unsigned initialized;
        unsigned free_offset;
        unsigned heap_remaining;
        unsigned reserved;
 };
 
-struct smem_heap_entry
-{
+struct smem_heap_entry {
        unsigned allocated;
        unsigned offset;
        unsigned size;
        unsigned reserved;
 };
 
-struct smem_proc_comm
-{
+struct smem_proc_comm {
        unsigned command;
        unsigned status;
        unsigned data1;
@@ -50,8 +51,7 @@ struct smem_proc_comm
 #define VERSION_APPS      8
 #define VERSION_MODEM     9
 
-struct smem_shared
-{
+struct smem_shared {
        struct smem_proc_comm proc_comm[4];
        unsigned version[32];
        struct smem_heap_info heap_info;
@@ -61,12 +61,28 @@ struct smem_shared
 #define SMSM_V1_SIZE           (sizeof(unsigned) * 8)
 #define SMSM_V2_SIZE           (sizeof(unsigned) * 4)
 
-struct smsm_interrupt_info
-{
-       uint32_t aArm_en_mask;
-       uint32_t aArm_interrupts_pending;
-       uint32_t aArm_wakeup_reason;
+#ifndef CONFIG_ARCH_MSM_SCORPION
+struct smsm_interrupt_info {
+       uint32_t interrupt_mask;
+       uint32_t pending_interrupts;
+       uint32_t wakeup_reason;
+};
+#else
+#define DEM_MAX_PORT_NAME_LEN (20)
+struct msm_dem_slave_data {
+       uint32_t sleep_time;
+       uint32_t interrupt_mask;
+       uint32_t resources_used;
+       uint32_t reserved1;
+
+       uint32_t wakeup_reason;
+       uint32_t pending_interrupts;
+       uint32_t rpc_prog;
+       uint32_t rpc_proc;
+       char     smd_port_name[DEM_MAX_PORT_NAME_LEN];
+       uint32_t reserved2;
 };
+#endif
 
 #define SZ_DIAG_ERR_MSG 0xC8
 #define ID_DIAG_ERR_MSG SMEM_DIAG_ERR_MESSAGE
@@ -131,13 +147,11 @@ void *smem_alloc(unsigned id, unsigned size);
 int smsm_change_state(enum smsm_state_item item, uint32_t clear_mask, uint32_t set_mask);
 uint32_t smsm_get_state(enum smsm_state_item item);
 int smsm_set_sleep_duration(uint32_t delay);
-int smsm_set_interrupt_info(struct smsm_interrupt_info *info);
 void smsm_print_sleep_info(void);
 
 #define SMEM_NUM_SMD_CHANNELS        64
 
-typedef enum
-{
+typedef enum {
        /* fixed items */
        SMEM_PROC_COMM = 0,
        SMEM_HEAP_INFO,
@@ -212,8 +226,108 @@ typedef enum
        SMEM_SMEM_LOG_POWER_WRAP,
        SMEM_SMEM_LOG_POWER_EVENTS,
        SMEM_ERR_CRASH_LOG,
-       SMEM_ERR_F3_TRACE_LOG,  
+       SMEM_ERR_F3_TRACE_LOG,
        SMEM_NUM_ITEMS,
 } smem_mem_type;
 
+
+#define SMD_SS_CLOSED          0x00000000
+#define SMD_SS_OPENING         0x00000001
+#define SMD_SS_OPENED          0x00000002
+#define SMD_SS_FLUSHING                0x00000003
+#define SMD_SS_CLOSING         0x00000004
+#define SMD_SS_RESET           0x00000005
+#define SMD_SS_RESET_OPENING   0x00000006
+
+#define SMD_BUF_SIZE           8192
+#define SMD_CHANNELS           64
+
+#define SMD_HEADER_SIZE                20
+
+struct smd_alloc_elm {
+       char name[20];
+       uint32_t cid;
+       uint32_t ctype;
+       uint32_t ref_count;
+};
+
+struct smd_half_channel {
+       unsigned state;
+       unsigned char fDSR;
+       unsigned char fCTS;
+       unsigned char fCD;
+       unsigned char fRI;
+       unsigned char fHEAD;
+       unsigned char fTAIL;
+       unsigned char fSTATE;
+       unsigned char fUNUSED;
+       unsigned tail;
+       unsigned head;
+} __attribute__(( aligned(4), packed ));
+
+struct smd_shared_v1 {
+       struct smd_half_channel ch0;
+       unsigned char data0[SMD_BUF_SIZE];
+       struct smd_half_channel ch1;
+       unsigned char data1[SMD_BUF_SIZE];
+};
+
+struct smd_shared_v2 {
+       struct smd_half_channel ch0;
+       struct smd_half_channel ch1;
+};
+
+struct smd_channel {
+       volatile struct smd_half_channel *send;
+       volatile struct smd_half_channel *recv;
+       unsigned char *send_data;
+       unsigned char *recv_data;
+
+       unsigned fifo_mask;
+       unsigned fifo_size;
+       unsigned current_packet;
+       unsigned n;
+
+       struct list_head ch_list;
+
+       void *priv;
+       void (*notify)(void *priv, unsigned flags);
+
+       int (*read)(struct smd_channel *ch, void *data, int len);
+       int (*write)(struct smd_channel *ch, const void *data, int len);
+       int (*read_avail)(struct smd_channel *ch);
+       int (*write_avail)(struct smd_channel *ch);
+
+       void (*update_state)(struct smd_channel *ch);
+       unsigned last_state;
+       void (*notify_other_cpu)(void);
+       unsigned type;
+
+       char name[32];
+       struct platform_device pdev;
+};
+
+#define SMD_TYPE_MASK          0x0FF
+#define SMD_TYPE_APPS_MODEM    0x000
+#define SMD_TYPE_APPS_DSP      0x001
+#define SMD_TYPE_MODEM_DSP     0x002
+
+#define SMD_KIND_MASK          0xF00
+#define SMD_KIND_UNKNOWN       0x000
+#define SMD_KIND_STREAM                0x100
+#define SMD_KIND_PACKET                0x200
+
+extern struct list_head smd_ch_closed_list;
+extern struct list_head smd_ch_list_modem;
+extern struct list_head smd_ch_list_dsp;
+
+extern spinlock_t smd_lock;
+extern spinlock_t smem_lock;
+
+void *smem_find(unsigned id, unsigned size);
+void *smem_item(unsigned id, unsigned *size);
+uint32_t raw_smsm_get_state(enum smsm_state_item item);
+
+extern void msm_init_last_radio_log(struct module *);
+
 #endif