Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6

[pandora-kernel.git] / drivers / scsi / bfa / bfa_modules.h

diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
index ab79ff6..1c6efd4 100644 (file)
--- a/drivers/scsi/bfa/bfa_modules.h
+++ b/drivers/scsi/bfa/bfa_modules.h
@@ -29,14 +29,21 @@
 #include "bfa_port.h"
 
 struct bfa_modules_s {
+       struct bfa_fcdiag_s     fcdiag;         /* fcdiag module */
        struct bfa_fcport_s     fcport;         /*  fc port module            */
        struct bfa_fcxp_mod_s   fcxp_mod;       /*  fcxp module       */
        struct bfa_lps_mod_s    lps_mod;        /*  fcxp module       */
        struct bfa_uf_mod_s     uf_mod;         /*  unsolicited frame module */
        struct bfa_rport_mod_s  rport_mod;      /*  remote port module        */
-       struct bfa_fcpim_mod_s  fcpim_mod;      /*  FCP initiator module     */
+       struct bfa_fcp_mod_s    fcp_mod;        /*  FCP initiator module     */
        struct bfa_sgpg_mod_s   sgpg_mod;       /*  SG page module            */
        struct bfa_port_s       port;           /*  Physical port module     */
+       struct bfa_ablk_s       ablk;           /*  ASIC block config module */
+       struct bfa_cee_s        cee;            /*  CEE Module  */
+       struct bfa_sfp_s        sfp;            /*  SFP module  */
+       struct bfa_flash_s      flash;          /*  flash module */
+       struct bfa_diag_s       diag_mod;       /*  diagnostics module  */
+       struct bfa_phy_s        phy;            /*  phy module          */
 };
 
 /*
@@ -51,17 +58,16 @@ enum {
        BFA_TRC_HAL_IOCFC_CB    = 5,
 };
 
-
 /*
  * Macro to define a new BFA module
  */
 #define BFA_MODULE(__mod)                                              \
        static void bfa_ ## __mod ## _meminfo(                          \
-                       struct bfa_iocfc_cfg_s *cfg, u32 *ndm_len,      \
-                       u32 *dm_len);      \
+                       struct bfa_iocfc_cfg_s *cfg,                    \
+                       struct bfa_meminfo_s *meminfo,                  \
+                       struct bfa_s *bfa);                             \
        static void bfa_ ## __mod ## _attach(struct bfa_s *bfa,         \
                        void *bfad, struct bfa_iocfc_cfg_s *cfg,        \
-                       struct bfa_meminfo_s *meminfo,                  \
                        struct bfa_pcidev_s *pcidev);      \
        static void bfa_ ## __mod ## _detach(struct bfa_s *bfa);      \
        static void bfa_ ## __mod ## _start(struct bfa_s *bfa);      \
@@ -87,11 +93,11 @@ enum {
  * can leave entry points as NULL)
  */
 struct bfa_module_s {
-       void (*meminfo) (struct bfa_iocfc_cfg_s *cfg, u32 *km_len,
-                       u32 *dm_len);
+       void (*meminfo) (struct bfa_iocfc_cfg_s *cfg,
+                        struct bfa_meminfo_s *meminfo,
+                        struct bfa_s *bfa);
        void (*attach) (struct bfa_s *bfa, void *bfad,
                        struct bfa_iocfc_cfg_s *cfg,
-                       struct bfa_meminfo_s *meminfo,
                        struct bfa_pcidev_s *pcidev);
        void (*detach) (struct bfa_s *bfa);
        void (*start) (struct bfa_s *bfa);
@@ -109,19 +115,20 @@ struct bfa_s {
        struct bfa_timer_mod_s  timer_mod;      /*  timer module            */
        struct bfa_modules_s    modules;        /*  BFA modules     */
        struct list_head        comp_q;         /*  pending completions     */
-       bfa_boolean_t           rme_process;    /*  RME processing enabled  */
+       bfa_boolean_t           queue_process;  /*  queue processing enabled */
        struct list_head        reqq_waitq[BFI_IOC_MAX_CQS];
        bfa_boolean_t           fcs;            /*  FCS is attached to BFA */
        struct bfa_msix_s       msix;
 };
 
 extern bfa_boolean_t bfa_auto_recover;
+extern struct bfa_module_s hal_mod_fcdiag;
 extern struct bfa_module_s hal_mod_sgpg;
 extern struct bfa_module_s hal_mod_fcport;
 extern struct bfa_module_s hal_mod_fcxp;
 extern struct bfa_module_s hal_mod_lps;
 extern struct bfa_module_s hal_mod_uf;
 extern struct bfa_module_s hal_mod_rport;
-extern struct bfa_module_s hal_mod_fcpim;
+extern struct bfa_module_s hal_mod_fcp;
 
 #endif /* __BFA_MODULES_H__ */