mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-30 18:05:48 +01:00 
			
		
		
		
	Fix warnings if compiling with IDE support.
cmd_ide.c:827: Warnung: weak declaration of `ide_outb' after first use results in unspecified behavior cmd_ide.c:839: Warnung: weak declaration of `ide_inb' after first use results in unspecified behavior Signed-off-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
		
				
					committed by
					
						 Wolfgang Denk
						Wolfgang Denk
					
				
			
			
				
	
			
			
			
						parent
						
							7610db17fd
						
					
				
				
					commit
					36d59bd9da
				
			| @@ -161,8 +161,6 @@ static uchar ide_wait  (int dev, ulong t); | ||||
|  | ||||
| #define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */ | ||||
|  | ||||
| void inline ide_outb(int dev, int port, unsigned char val); | ||||
| unsigned char inline ide_inb(int dev, int port); | ||||
| static void input_data(int dev, ulong *sect_buf, int words); | ||||
| static void output_data(int dev, ulong *sect_buf, int words); | ||||
| static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len); | ||||
| @@ -523,6 +521,28 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) | ||||
|  | ||||
| /* ------------------------------------------------------------------------- */ | ||||
|  | ||||
| void inline | ||||
| __ide_outb(int dev, int port, unsigned char val) | ||||
| { | ||||
| 	debug ("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n", | ||||
| 		dev, port, val, (ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port))); | ||||
| 	outb(val, (ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port))); | ||||
| } | ||||
| void inline ide_outb (int dev, int port, unsigned char val) | ||||
| 		__attribute__((weak, alias("__ide_outb"))); | ||||
|  | ||||
| unsigned char inline | ||||
| __ide_inb(int dev, int port) | ||||
| { | ||||
| 	uchar val; | ||||
| 	val = inb((ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port))); | ||||
| 	debug ("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n", | ||||
| 		dev, port, (ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port)), val); | ||||
| 	return val; | ||||
| } | ||||
| unsigned char inline ide_inb(int dev, int port) | ||||
| 			__attribute__((weak, alias("__ide_inb"))); | ||||
|  | ||||
| void ide_init (void) | ||||
| { | ||||
|  | ||||
| @@ -817,28 +837,6 @@ set_pcmcia_timing (int pmode) | ||||
|  | ||||
| /* ------------------------------------------------------------------------- */ | ||||
|  | ||||
| void inline | ||||
| __ide_outb(int dev, int port, unsigned char val) | ||||
| { | ||||
| 	debug ("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n", | ||||
| 		dev, port, val, (ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port))); | ||||
| 	outb(val, (ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port))); | ||||
| } | ||||
| void inline ide_outb (int dev, int port, unsigned char val) | ||||
| 		__attribute__((weak, alias("__ide_outb"))); | ||||
|  | ||||
| unsigned char inline | ||||
| __ide_inb(int dev, int port) | ||||
| { | ||||
| 	uchar val; | ||||
| 	val = inb((ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port))); | ||||
| 	debug ("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n", | ||||
| 		dev, port, (ATA_CURR_BASE(dev)+CFG_ATA_PORT_ADDR(port)), val); | ||||
| 	return val; | ||||
| } | ||||
| unsigned char inline ide_inb(int dev, int port) | ||||
| 			__attribute__((weak, alias("__ide_inb"))); | ||||
|  | ||||
| #ifdef __PPC__ | ||||
| # ifdef CONFIG_AMIGAONEG3SE | ||||
| static void | ||||
|   | ||||
		Reference in New Issue
	
	Block a user