Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / chp.h

diff --git a/drivers/s390/cio/chp.h b/drivers/s390/cio/chp.h
index ac2b1a9c3bc2d2396db69b9eca9e8cb3999916e1..65286563c592c70e47b1979c177910fc2c3f768c 100644 (file)
--- a/drivers/s390/cio/chp.h
+++ b/drivers/s390/cio/chp.h
@@ -10,10 +10,23 @@
 
 #include <linux/types.h>
 #include <linux/device.h>
-
-#include "chpid.h"
+#include <asm/chpid.h>
 #include "chsc.h"
 
+#define CHP_STATUS_STANDBY             0
+#define CHP_STATUS_CONFIGURED          1
+#define CHP_STATUS_RESERVED            2
+#define CHP_STATUS_NOT_RECOGNIZED      3
+
+static inline int chp_test_bit(u8 *bitmap, int num)
+{
+       int byte = num >> 3;
+       int mask = 128 >> (num & 7);
+
+       return (bitmap[byte] & mask) ? 1 : 0;
+}
+
+
 struct channel_path {
        struct chp_id chpid;
        int state;
@@ -29,9 +42,12 @@ int chp_get_status(struct chp_id chpid);
 u8 chp_get_sch_opm(struct subchannel *sch);
 int chp_is_registered(struct chp_id chpid);
 void *chp_get_chp_desc(struct chp_id chpid);
-int chp_process_crw(int id, int available);
+void chp_process_crw(int id, int available);
 void chp_remove_cmg_attr(struct channel_path *chp);
 int chp_add_cmg_attr(struct channel_path *chp);
 int chp_new(struct chp_id chpid);
+void chp_cfg_schedule(struct chp_id chpid, int configure);
+void chp_cfg_cancel_deconfigure(struct chp_id chpid);
+int chp_info_get_status(struct chp_id chpid);
 
 #endif /* S390_CHP_H */