Changeset 11989 in vbox for trunk/src/VBox/Devices/PC/Etherboot-src/core

Timestamp:

Sep 2, 2008 1:43:18 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35893

Message:

All: fix typo in filemuncher and 2 wrong headers resulting from it

Location:

trunk/src/VBox/Devices/PC/Etherboot-src/core

Files:

• proto_tftm.c (modified) (3 diffs)
• pxe_export.c (modified) (16 diffs)

trunk/src/VBox/Devices/PC/Etherboot-src/core/proto_tftm.c

@@ -1 +1 @@
 /**************************************************************************
 *
-*    proto_tftm.c -- Etherboot Multicast TFTP 
+*    proto_tftm.c -- Etherboot Multicast TFTP
 *    Written 2003-2003 by Timothy Legge <[email protected]>
 *
@@ -18 +18 @@
 *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
-*    This code is based on the DOWNLOAD_PROTO_TFTM section of 
+*    This code is based on the DOWNLOAD_PROTO_TFTM section of
 *    Etherboot 5.3 core/nic.c and:
+*
+*    Anselm Martin Hoffmeister's previous proto_tftm.c multicast work
+*    Eric Biederman's proto_slam.c
+*
+*    REVISION HISTORY:
+*    ================
+*    09-07-2003 timlegge        Release Version, Capable of Multicast Booting
+*    08-30-2003 timlegge        Initial version, Assumes consecutive blocks
+*
+*    Indent Options: indent -kr -i8
+***************************************************************************/
 
 /*
@@ -29 +40 @@
  * of the GPL is applied is otherwise unspecified.
  */
-*    
-*    Anselm Martin Hoffmeister's previous proto_tftm.c multicast work
-*    Eric Biederman's proto_slam.c
-*
-*    $Revision$
-*    $Author$
-*    $Date$
-*
-*    REVISION HISTORY:
-*    ================
-*    09-07-2003 timlegge        Release Version, Capable of Multicast Booting
-*    08-30-2003 timlegge        Initial version, Assumes consecutive blocks
-*
-*    Indent Options: indent -kr -i8
-***************************************************************************/
 
 #ifdef DOWNLOAD_PROTO_TFTM

trunk/src/VBox/Devices/PC/Etherboot-src/core/pxe_export.c

@@ -17 +17 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+/*
+ * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * the General Public License version 2 (GPLv2) at this time for any software where
+ * a choice of GPL license versions is made available with the language indicating
+ * that GPLv2 or any later version may be used, or where a choice of which version
+ * of the GPL is applied is otherwise unspecified.
+ */
+
 
 /* Tags used in this file:
@@ -148 +158 @@
                 nic.dev.how_probe = PROBE_FIRST;
         }
-        
+
         /* Call probe routine to bring up the NIC */
         if ( eth_probe ( &nic.dev ) != PROBE_WORKED ) {
@@ -400 +410 @@
         /* Send the packet */
         eth_transmit ( dest, type, length, data );
-        
+
         undi_transmit->Status = PXENV_STATUS_SUCCESS;
         return PXENV_EXIT_SUCCESS;
@@ -561 +571 @@
                                        *undi_get_nic_type ) {
         struct dev *dev = &nic.dev;
-        
+
         DBG ( "PXENV_UNDI_GET_NIC_TYPE" );
         ENSURE_READY ( undi_get_nic_type );
-        
+
         if ( dev->to_probe == PROBE_PCI ) {
                 struct pci_device *pci = &dev->state.pci.dev;
@@ -646 +656 @@
                 return PXENV_EXIT_FAILURE;
         }
-        
+
         /* Just in case some idiot actually looks at these fields when
          * we weren't meant to fill them in...
@@ -818 +828 @@
 
         /* Change server address if different */
-        if ( tftp_open->ServerIPAddress && 
+        if ( tftp_open->ServerIPAddress &&
              tftp_open->ServerIPAddress!=arptable[ARP_SERVER].ipaddr.s_addr ) {
                 memset(arptable[ARP_SERVER].node, 0, ETH_ALEN ); /* kill arp */
@@ -827 +837 @@
         request.name = tftp_open->FileName;
         request.port = ntohs(tftp_open->TFTPPort);
-#ifdef WORK_AROUND_BPBATCH_BUG        
-        /* Force use of port 69; BpBatch tries to use port 4 for some         
-        * bizarre reason.         */        
+#ifdef WORK_AROUND_BPBATCH_BUG
+        /* Force use of port 69; BpBatch tries to use port 4 for some
+        * bizarre reason.         */
         request.port = TFTP_PORT;
 #endif
@@ -894 +904 @@
         DBG ( " %d to %hx:%hx", block.len, tftp_read->Buffer.segment,
               tftp_read->Buffer.offset );
- 
+
         tftp_read->Status = PXENV_STATUS_SUCCESS;
         return PXENV_EXIT_SUCCESS;
@@ -1015 +1025 @@
                 return 0;
         }
-        
+
         /* Check dest_ip */
         if ( udp_read->dest_ip && ( udp_read->dest_ip != ip->dest.s_addr ) ) {
@@ -1089 +1099 @@
         DBG ( " %d->%@:%d (%d)", src_port, udp_write->ip, dst_port,
               udp_write->buffer_size );
-        
+
         /* FIXME: we ignore the gateway specified, since we're
          * confident of being able to do our own routing.  We should
          * probably allow for multiple gateways.
          */
-        
+
         /* Copy payload to packet buffer */
         packet_size = ( (void*)&packet->payload - (void*)packet )
@@ -1198 +1208 @@
 #else /* !VBOX */
         /* I don't think there's actually any way we can be called in
-         * the middle of a DHCP request... 
+         * the middle of a DHCP request...
          */
         cached_info->opcode = BOOTP_REP;
@@ -1225 +1235 @@
         memcpy ( &cached_info->vendor.d, bootp_data.bootp_reply.bp_vend,
                  sizeof(cached_info->vendor.d) );
-        
+
         /* Copy to user-specified buffer, or set pointer to our buffer */
         get_cached_info->BufferLimit = sizeof(*cached_info);
@@ -1325 +1335 @@
 
         DBG ( "PXENV_UNDI_LOADER" );
-        
+
         /* Set UNDI DS as our real-mode stack */
         use_undi_ds_for_rm_stack ( loader->undi_ds );
@@ -1351 +1361 @@
         /* Install PXE stack to area specified by NBP */
         install_pxe_stack ( VIRTUAL ( loader->undi_cs, 0 ) );
-        
+
         /* Call pxenv_start_undi to set parameters.  Why the hell PXE
          * requires these parameters to be provided twice is beyond
@@ -1366 +1376 @@
         PTR_TO_SEGOFF16 ( &pxe_stack->pxe, loader->pxe_ptr );
         PTR_TO_SEGOFF16 ( &pxe_stack->pxenv, loader->pxenv_ptr );
-        
+
         loader->Status = PXENV_STATUS_SUCCESS;
         return PXENV_EXIT_SUCCESS;
@@ -1506 +1516 @@
                 ret = pxenv_undi_loader ( &params->loader );
                 break;
-                
+
         default:
                 DBG ( "PXENV_UNKNOWN_%hx", opcode );