[BACK]Return to sa11x1_var.h CVS log [TXT][DIR] Up to [local] / sys / arch / arm / sa11x0

Diff for /sys/arch/arm/sa11x0/sa11x1_var.h between version 1.1.1.1 and 1.2

version 1.1.1.1, 2008/03/04 16:05:18 version 1.2, 2008/03/05 11:11:22
Line 45 
Line 45 
   
 #include <machine/bus.h>  #include <machine/bus.h>
   
 typedef int (* sa11x1_irq_handler_t)(void *);  struct sacc_softc {
   
 #if 0  
 struct sa11x0_softc {  
         struct device sc_dev;          struct device sc_dev;
         bus_space_tag_t sc_iot;  
         bus_space_handle_t sc_ioh;  
         bus_space_handle_t sc_gpioh;  
         bus_space_handle_t sc_ppch;  
         bus_space_handle_t sc_dmach;  
         bus_space_handle_t sc_reseth;  
         u_int32_t sc_intrmask;  
 };  
 #endif /* 0 */  
 /* Attach args all devices */  
   
 typedef void *sa11x1_chipset_tag_t;          /* our interrupt on SA1110 (usually, intr 0 - GPIO pin 0) */
           int     sc_intr;
   
 struct sa11x1_attach_args {          /* our own bus/dma tags (note that we needn't parent iot) */
         sa11x1_chipset_tag_t    sa_sc;          bus_space_tag_t sc_bust;
         bus_space_tag_t         sa_iot;         /* Bus tag */          bus_dma_tag_t sc_dmat;
         bus_addr_t              sa_addr;        /* i/o address (actually, offset from sacc base) */  
         bus_size_t              sa_size;  
   
         int                     sa_intr;          /* onboard peripheral space (12 units * 128 words) */
         int                     sa_gpio;          bus_space_handle_t      sc_ioh;
 };  };
   
 struct sacc_attach_args {  struct sacc_attach_args {
         struct sa11x0_attach_args       sac_saa;          bus_space_tag_t sac_iot;
         bus_dma_tag_t   sac_dmat;          bus_dma_tag_t   sac_dmat;
   
 #define sac_iot         sac_saa.sa_iot          /* we export whole i/o space */
 #define sac_addr        sac_saa.sa_addr          bus_space_handle_t      sac_bush;
 #define sac_size        sac_saa.sa_size          /* interrupt on the SA1111 INTC */
 #define sac_intr        sac_saa.sa_intr          int     sac_xintr;
   
   /*      int     sac_gpio; XXX */
   
           /* device type (for subsequent matches) */
           int     sac_typecookie;
 };  };
   /* peripheral types */
   #define SACC_TYPE_SBI   0x00
   #define SACC_TYPE_SK    0x01
   #define SACC_TYPE_USB   0x02
   #define SACC_TYPE_AUDIO 0x03
   #define SACC_TYPE_SSP   0x04
   #define SACC_TYPE_TRACK 0x05
   #define SACC_TYPE_MOUSE 0x06
   #define SACC_TYPE_GPIO  0x07
   #define SACC_TYPE_INTC  0x08
   #define SACC_TYPE_PCIC  0x09
   
   
 extern struct bus_space sa11x1_bs_tag;  extern struct bus_space sa11x1_bs_tag;
 //extern struct arm32_bus_dma_tag       sa11x0_bus_dma_tag;  //extern struct arm32_bus_dma_tag       sa11x0_bus_dma_tag;
   
 #if 0  
 void *sa11x1_intr_establish(sa11x0_chipset_tag_t, int, int, int,  
                             int (*)(void *), void *, char *);  
 void sa11x1_intr_disestablish(void *);  
 void sa11x1_init_interrupt_masks(void);  
 #endif /* 0 */  
 #endif /* _SA11X1_VAR_H */  #endif /* _SA11X1_VAR_H */
Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.2
CVSweb