: include/asm-ia64/sn [u]intX_t cleanup
PATCH 2/2 : include/asm-ia64/sn [u]intX_t cleanup
In include/asm-ia64/sn, excluding pic.h, shubio.h, and tioce.h
Replace uintX_t declarations with uX declarations. Replace intX_t declarations with sX declarations.
Signed-off-by Prarit Bhargava <[email protected]>
---
commit 388e2e7769a5e7d4e2cfe3f90dbf33568ff78170
tree 66f28f26f9ca4ec39349b7cdf511426b725c912a
parent 2ed3f5435b5b99558d4a4235d2f0237af8ec3568
author Prarit Bhargava <[email protected]> Sat, 14 Jan 2006 18:57:52 -0500 committer Prarit Bhargava <[email protected]> Sat, 14 Jan 2006 18:57:52 -0500
include/asm-ia64/sn/intr.h | 2 include/asm-ia64/sn/pcibr_provider.h | 48 +++-- include/asm-ia64/sn/pcibus_provider_defs.h | 14 +- include/asm-ia64/sn/pcidev.h | 4 include/asm-ia64/sn/sn_sal.h | 12 + include/asm-ia64/sn/tioca.h | 78 ++++----- include/asm-ia64/sn/tioca_provider.h | 56 +++--- include/asm-ia64/sn/tioce_provider.h | 30 ++- include/asm-ia64/sn/tiocp.h | 254 ++++++++++++++-------------- include/asm-ia64/sn/tiocx.h | 14 +- 10 files changed, 256 insertions(+), 256 deletions(-)
include/asm-ia64/sn/intr.h +1 -1
@@ -40,7 +40,7 @@ struct sn_irq_info {int irq_cpuid;/* kernel logical cpuid */ int irq_irq;/* the IRQ number */ int irq_int_bit;/* Bridge interrupt pin */ -uint64_t irq_xtalkaddr;/* xtalkaddr IRQ is sent to */ +u64 irq_xtalkaddr;/* xtalkaddr IRQ is sent to */ int irq_bridge_type;/* pciio asic type (pciio.h) */ void *irq_bridge;/* bridge generating irq */ void *irq_pciioinfo;/* associated pciio_info_t */
include/asm-ia64/sn/pcibr_provider.h +24 -24
89 lines not on this page · raw message
include/asm-ia64/sn/pcibus_provider_defs.h +7 -7
@@ -29,13 +29,13 @@*/ struct pcibus_bussoft { -uint32_t bs_asic_type;/* chipset type */ -uint32_t bs_xid;/* xwidget id */ -uint32_t bs_persist_busnum;/* Persistent Bus Number */ -uint32_t bs_persist_segment;/* Segment Number */ -uint64_t bs_legacy_io;/* legacy io pio addr */ -uint64_t bs_legacy_mem;/* legacy mem pio addr */ -uint64_t bs_base;/* widget base */ +u32 bs_asic_type;/* chipset type */ +u32 bs_xid;/* xwidget id */ +u32 bs_persist_busnum;/* Persistent Bus Number */ +u32 bs_persist_segment;/* Segment Number */ +u64 bs_legacy_io;/* legacy io pio addr */ +u64 bs_legacy_mem;/* legacy mem pio addr */ +u64 bs_base;/* widget base */ struct xwidget_info *bs_xwidget_info; };
include/asm-ia64/sn/pcidev.h +2 -2
@@ -55,8 +55,8 @@ struct sn_pci_controller {#define PCIIO_VENDOR_ID_NONE (-1)struct pcidev_info { -uint64_t pdi_pio_mapped_addr[7 ];/* 6 BARs PLUS 1 ROM */ -uint64_t pdi_slot_host_handle;/* Bus and devfn Host pci_dev */ +u64 pdi_pio_mapped_addr[7 ];/* 6 BARs PLUS 1 ROM */ +u64 pdi_slot_host_handle;/* Bus and devfn Host pci_dev */ struct pcibus_bussoft *pdi_pcibus_info;/* Kernel common bus soft */ struct pcidev_info *pdi_host_pcidev_info;/* Kernel Host pci_dev */
include/asm-ia64/sn/sn_sal.h +6 -6
@@ -272,7 +272,7 @@ ia64_sn_console_putc(char ch) ret_stuff.v0 =0 ; ret_stuff.v1 =0 ; ret_stuff.v2 =0 ; -SAL_CALL_NOLOCK (ret_stuff,SN_SAL_CONSOLE_PUTC , (uint64_t )ch,0 ,0 ,0 ,0 ,0 ,0 ); +SAL_CALL_NOLOCK (ret_stuff,SN_SAL_CONSOLE_PUTC , (u64 )ch,0 ,0 ,0 ,0 ,0 ,0 );return ret_stuff.status; }
@@ -289,7 +289,7 @@ ia64_sn_console_putb(const char *buf, in ret_stuff.v0 =0 ; ret_stuff.v1 =0 ; ret_stuff.v2 =0 ; -SAL_CALL_NOLOCK (ret_stuff,SN_SAL_CONSOLE_PUTB , (uint64_t )buf, (uint64_t )len,0 ,0 ,0 ,0 ,0 ); +SAL_CALL_NOLOCK (ret_stuff,SN_SAL_CONSOLE_PUTB , (u64 )buf, (u64 )len,0 ,0 ,0 ,0 ,0 );if ( ret_stuff.status =0 ) {return ret_stuff.v0;
@@ -309,7 +309,7 @@ ia64_sn_plat_specific_err_print(int (*ho ret_stuff.v0 =0 ; ret_stuff.v1 =0 ; ret_stuff.v2 =0 ; -SAL_CALL_REENTRANT (ret_stuff,SN_SAL_PRINT_ERROR , (uint64_t )hook, (uint64_t )rec,0 ,0 ,0 ,0 ,0 ); +SAL_CALL_REENTRANT (ret_stuff,SN_SAL_PRINT_ERROR , (u64 )hook, (u64 )rec,0 ,0 ,0 ,0 ,0 );return ret_stuff.status; }
@@ -397,7 +397,7 @@ ia64_sn_console_intr_status(void)* Enable an interrupt on the SAL console device. */ static inline void -ia64_sn_console_intr_enable (uint64_t intr) +ia64_sn_console_intr_enable (u64 intr) {struct ia64_sal_retval ret_stuff;
@@ -414,7 +414,7 @@ ia64_sn_console_intr_enable(uint64_t int* Disable an interrupt on the SAL console device. */ static inline void -ia64_sn_console_intr_disable (uint64_t intr) +ia64_sn_console_intr_disable (u64 intr) {struct ia64_sal_retval ret_stuff;
@@ -440,7 +440,7 @@ ia64_sn_console_xmit_chars(char *buf, in ret_stuff.v1 =0 ; ret_stuff.v2 =0 ;SAL_CALL_NOLOCK (ret_stuff,SN_SAL_CONSOLE_XMIT_CHARS , - (uint64_t )buf, (uint64_t )len, + (u64 )buf, (u64 )len,0 ,0 ,0 ,0 ,0 );if (ret_stuff.status =0 ) {
include/asm-ia64/sn/tioca.h +39 -39
86 lines not on this page · raw message
include/asm-ia64/sn/tioca_provider.h +28 -28
93 lines not on this page · raw message
include/asm-ia64/sn/tioce_provider.h +15 -15
@@ -21,9 +21,9 @@struct tioce_common {struct pcibus_bussoft ce_pcibus;/* common pciio header */ -uint32_t ce_rev; -uint64_t ce_kernel_private; -uint64_t ce_prom_private; +u32 ce_rev; +u64 ce_kernel_private; +u64 ce_prom_private; };struct tioce_kernel {
@@ -31,31 +31,31 @@ struct tioce_kernel {spinlock_t ce_lock;struct list_head ce_dmamap_list; -uint64_t ce_ate40_shadow[TIOCE_NUM_M40_ATES ]; -uint64_t ce_ate3240_shadow[TIOCE_NUM_M3240_ATES ]; -uint32_t ce_ate3240_pagesize; +u64 ce_ate40_shadow[TIOCE_NUM_M40_ATES ]; +u64 ce_ate3240_shadow[TIOCE_NUM_M3240_ATES ]; +u32 ce_ate3240_pagesize; -uint8_t ce_port1_secondary; +u8 ce_port1_secondary;/* per-port resources */ struct {int dirmap_refcnt; -uint64_t dirmap_shadow; +u64 dirmap_shadow; } ce_port[TIOCE_NUM_PORTS ]; };struct tioce_dmamap {struct list_head ce_dmamap_list;/* headed by tioce_kernel */ -uint32_t refcnt; +u32 refcnt; -uint64_t nbytes;/* # bytes mapped */ +u64 nbytes;/* # bytes mapped */ -uint64_t ct_start;/* coretalk start address */ -uint64_t pci_start;/* bus start address */ +u64 ct_start;/* coretalk start address */ +u64 pci_start;/* bus start address */ -uint64_t *ate_hw;/* hw ptr of first ate in map */ -uint64_t *ate_shadow;/* shadow ptr of firat ate */ -uint16_t ate_count;/* # ate's in the map */ +u64 *ate_hw;/* hw ptr of first ate in map */ +u64 *ate_shadow;/* shadow ptr of firat ate */ +u16 ate_count;/* # ate's in the map */ };extern int tioce_init_provider (void );
include/asm-ia64/sn/tiocp.h +127 -127
356 lines not on this page · raw message
include/asm-ia64/sn/tiocx.h +7 -7
@@ -40,10 +40,10 @@ struct cx_drv { };/* create DMA address by stripping AS bits */ -#define TIOCX_DMA_ADDR (a) (uint64_t)((uint64_t)(a) & 0xffffcfffffffffUL) +#define TIOCX_DMA_ADDR (a) (u64)((u64)(a) & 0xffffcfffffffffUL) -#define TIOCX_TO_TIOCX_DMA_ADDR (a) (uint64_t)(((uint64_t)(a) & 0xfffffffff) | \ - ((((uint64_t)(a)) & 0xffffc000000000UL) <<2)) +#define TIOCX_TO_TIOCX_DMA_ADDR (a) (u64)(((u64)(a) & 0xfffffffff) | \ + ((((u64)(a)) & 0xffffc000000000UL) <<2))#define TIO_CE_ASIC_PARTNUM 0xce00#define TIOCX_CORELET 3
@@ -63,10 +63,10 @@ extern int cx_device_unregister(struct cextern int cx_device_register (nasid_t ,int ,int ,struct hubdev_info *,int );extern int cx_driver_unregister (struct cx_drv *);extern int cx_driver_register (struct cx_drv *); -extern uint64_t tiocx_dma_addr (uint64_t addr); -extern uint64_t tiocx_swin_base (int nasid); -extern void tiocx_mmr_store (int nasid,uint64_t offset,uint64_t value); -extern uint64_t tiocx_mmr_load (int nasid,uint64_t offset); +extern u64 tiocx_dma_addr (u64 addr); +extern u64 tiocx_swin_base (int nasid); +extern void tiocx_mmr_store (int nasid,u64 offset,u64 value); +extern u64 tiocx_mmr_load (int nasid,u64 offset);#endif // __KERNEL__ #endif // _ASM_IA64_SN_TIO_TIOCX__