svn commit: r245523 - in user/sbruno/pxestuff/sys/boot/i386: btx/lib pxehttp

[Sean Bruno]

Author: sbruno
Date: Thu Jan 17 01:18:24 2013
New Revision: 245523
URL: http://svnweb.freebsd.org/changeset/base/245523

Log:
  Rename conflicting function name/routines to not conflict with existing
  libbtx/i386 functions.

Modified:
  user/sbruno/pxestuff/sys/boot/i386/btx/lib/btxv86.h
  user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_core.c
  user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.S
  user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.h

Modified: user/sbruno/pxestuff/sys/boot/i386/btx/lib/btxv86.h
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/btx/lib/btxv86.h	Thu Jan 17 00:50:25 2013	(r245522)
+++ user/sbruno/pxestuff/sys/boot/i386/btx/lib/btxv86.h	Thu Jan 17 01:18:24 2013	(r245523)
@@ -64,9 +64,4 @@ extern u_int32_t	__args;
 void __exit(int) __attribute__((__noreturn__));
 void __exec(caddr_t, ...);
 
-/*
- *  Installs interrupt handler function for interrupt int_num.
- *  caddr_t - in userspace.
- */
-void __isr_install(caddr_t isr, uint16_t int_num);
 #endif /* !_BTXV86_H_ */

Modified: user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_core.c
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_core.c	Thu Jan 17 00:50:25 2013	(r245522)
+++ user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_core.c	Thu Jan 17 01:18:24 2013	(r245523)
@@ -431,7 +431,7 @@ pxe_core_install_isr()
 	pxe_memset(&v86, 0, sizeof(v86));
 
 	v86.ctl  = V86_ADDR | V86_CALLF | V86_FLAGS;
-	v86.addr = (VTOPSEG(__isr_install) << 16) | VTOPOFF(__isr_install);
+	v86.addr = (VTOPSEG(__pxe_isr_install) << 16) | VTOPOFF(__pxe_isr_install);
 	v86.eax = int_num;
 	v86.ebx = VTOPSEG(__pxe_isr);
 	v86.edx = VTOPOFF(__pxe_isr);
@@ -490,7 +490,7 @@ pxe_core_remove_isr()
 	pxe_memset(&v86, 0, sizeof(v86));
 
 	v86.ctl  = V86_ADDR | V86_CALLF | V86_FLAGS;
-	v86.addr = (VTOPSEG(__isr_install) << 16) | VTOPOFF(__isr_install);
+	v86.addr = (VTOPSEG(__pxe_isr_install) << 16) | VTOPOFF(__pxe_isr_install);
 
 	uint8_t int_num = (__pxe_nic_irq < 8) ?
 			   __pxe_nic_irq + 0x08 : __pxe_nic_irq + 0x68;	
@@ -1104,19 +1104,3 @@ pxe_set_ip(uint8_t id, const PXE_IPADDR 
 		pxe_memcpy(new_ip, &core_ips[id], sizeof(PXE_IPADDR));
 	}
 }
-
-/* getsecs() - returns time in seconds
- * in:
- *      none
- * out:
- *      elapsed time in seconds
- */
-time_t
-getsecs()
-{
-	time_t secs = 0;
-	 
-	time(&secs);
-	
-	return (secs);
-}

Modified: user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.S
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.S	Thu Jan 17 00:50:25 2013	(r245522)
+++ user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.S	Thu Jan 17 01:18:24 2013	(r245523)
@@ -34,8 +34,8 @@
 		.globl	__pxe_entry_off, __pxe_entry_seg
 		.globl	__pxe_entry_off2, __pxe_entry_seg2		
 		.globl  __pxe_call
-		.globl  __isr_install
-		.globl  __isr_remove
+		.globl  __pxe_isr_install
+		.globl  __pxe_isr_remove
 		.globl	__pxe_isr
 		.globl	__chained_irq_off
 		.globl	__chained_irq_seg
@@ -287,7 +287,7 @@ pxe_isr.2:
 		.byte	0xcb
 
 /*
- * __isr_install() - installs interrupt handler for provided IRQ,
+ * __pxe_isr_install() - installs interrupt handler for provided IRQ,
  *		saves previous ("chained") handler
  * in:
  * 	AX - interrupt number (not IRQ)
@@ -297,7 +297,7 @@ pxe_isr.2:
  *	BX - chained ISR segment
  *      DX - chained ISR offset
  */
-__isr_install:	
+__pxe_isr_install:	
 		cli				# no interrupts
 		pushl   %edi			# saving affected registers
 		pushw	%ds			#
@@ -322,7 +322,7 @@ __isr_install:	
 		.byte	0xcb			# back to vm86
 
 
-/* __isr_remove() - uninstalls ISR
+/* __pxe_isr_remove() - uninstalls ISR
  * Adopted from Intel PXE SDK
  * removes interrupt handler for provided IRQ, restores previous handler
  * in:
@@ -331,7 +331,7 @@ __isr_install:	
  * out:
  *	none
  */
-__isr_remove:	pushf
+__pxe_isr_remove:	pushf
 		pushl	%ebx
 		
 		shlw    $2, %bx			# calculating offset of
@@ -341,7 +341,7 @@ __isr_remove:	pushf
 
 		movw	%es:(%bx), %ax		# get offset to current handler
 
-isr_remove.3:	#movl   chained_irq_off, %eax	# getting old chained handler
+pxe_isr_remove.3:	#movl   chained_irq_off, %eax	# getting old chained handler
 		#movl   %eax, %es:(%bx)		# restore it
 
 /*
@@ -350,7 +350,7 @@ isr_remove.3:	#movl   chained_irq_off, %
  *		call    unmask_int		# unmasking
  **/
 
-isr_remove.fin:
+pxe_isr_remove.fin:
 #		movl    $0x0, chained_irq_off
 		popl	%ebx
 		popf

Modified: user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.h
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.h	Thu Jan 17 00:50:25 2013	(r245522)
+++ user/sbruno/pxestuff/sys/boot/i386/pxehttp/pxe_isr.h	Thu Jan 17 01:18:24 2013	(r245523)
@@ -54,7 +54,7 @@ extern void __pxe_call(void);	/* PXE API
 extern void __pxe_isr(void);	/* PXE API call */
 
 extern void	__mask_irq(void);	/* masks irq */
-extern void	__isr_install(void);	/* installs handler for interrupt */
+extern void	__pxe_isr_install(void);/* installs handler for interrupt */
 extern void	__isr_remove(void);	/* remove handler, ! not working ! now */
 extern void	__mem_copy(void);	/* copies memory in vm86 mode */