diff options
Diffstat (limited to 'src/drivers/net')
95 files changed, 361 insertions, 361 deletions
diff --git a/src/drivers/net/3c509-eisa.c b/src/drivers/net/3c509-eisa.c index d57c05b4..bb13f48c 100644 --- a/src/drivers/net/3c509-eisa.c +++ b/src/drivers/net/3c509-eisa.c @@ -4,8 +4,8 @@ * */ -#include <gpxe/eisa.h> -#include <gpxe/isa.h> +#include <ipxe/eisa.h> +#include <ipxe/isa.h> #include "console.h" #include "3c509.h" diff --git a/src/drivers/net/3c509.c b/src/drivers/net/3c509.c index 1c58f779..4326a835 100644 --- a/src/drivers/net/3c509.c +++ b/src/drivers/net/3c509.c @@ -10,10 +10,10 @@ FILE_LICENCE ( BSD2 ); #include <stdlib.h> #include <string.h> #include <errno.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <unistd.h> -#include <gpxe/device.h> -#include <gpxe/isa.h> +#include <ipxe/device.h> +#include <ipxe/isa.h> #include "3c509.h" /* diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c index eb9569fb..2b860690 100644 --- a/src/drivers/net/3c515.c +++ b/src/drivers/net/3c515.c @@ -49,9 +49,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include "etherboot.h" /* to get the interface to the body of the program */ #include "nic.h" -#include <gpxe/isapnp.h> -#include <gpxe/isa.h> /* for ISA_ROM */ -#include <gpxe/ethernet.h> +#include <ipxe/isapnp.h> +#include <ipxe/isa.h> /* for ISA_ROM */ +#include <ipxe/ethernet.h> static void t3c515_wait(unsigned int nticks) { diff --git a/src/drivers/net/3c529.c b/src/drivers/net/3c529.c index 42824644..d68f28ec 100644 --- a/src/drivers/net/3c529.c +++ b/src/drivers/net/3c529.c @@ -6,8 +6,8 @@ FILE_LICENCE ( BSD2 ); #include "etherboot.h" -#include <gpxe/mca.h> -#include <gpxe/isa.h> /* for ISA_ROM */ +#include <ipxe/mca.h> +#include <ipxe/isa.h> /* for ISA_ROM */ #include "nic.h" #include "3c509.h" diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c index 07c85d03..3178178a 100644 --- a/src/drivers/net/3c595.c +++ b/src/drivers/net/3c595.c @@ -29,8 +29,8 @@ FILE_LICENCE ( BSD2 ); #include "etherboot.h" #include "nic.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include "3c595.h" static struct nic_operations t595_operations; diff --git a/src/drivers/net/3c5x9.c b/src/drivers/net/3c5x9.c index 87c9f29a..4d9bc8d9 100644 --- a/src/drivers/net/3c5x9.c +++ b/src/drivers/net/3c5x9.c @@ -26,10 +26,10 @@ FILE_LICENCE ( BSD2 ); /* #define EDEBUG */ -#include <gpxe/ethernet.h> +#include <ipxe/ethernet.h> #include "etherboot.h" #include "nic.h" -#include <gpxe/isa.h> +#include <ipxe/isa.h> #include "3c509.h" static enum { none, bnc, utp } connector = none; /* for 3C509 */ diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c index 9c1879bb..760d3552 100644 --- a/src/drivers/net/3c90x.c +++ b/src/drivers/net/3c90x.c @@ -1,11 +1,11 @@ /* - * 3c90x.c -- This file implements a gPXE API 3c90x driver + * 3c90x.c -- This file implements a iPXE API 3c90x driver * * Originally written for etherboot by: * Greg Beeley, Greg.Beeley@LightSys.org * Modified by Steve Smith, * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net). - * Almost totally Rewritten to use gPXE API, implementation of tx/rx ring support + * Almost totally Rewritten to use iPXE API, implementation of tx/rx ring support * by Thomas Miletich, thomas.miletich@gmail.com * Thanks to Marty Connor and Stefan Hajnoczi for their help and feedback, * and to Daniel Verkamp for his help with testing. @@ -47,15 +47,15 @@ FILE_LICENCE ( BSD2 ); #include <assert.h> #include <byteswap.h> #include <errno.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/io.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/netdevice.h> -#include <gpxe/pci.h> -#include <gpxe/timer.h> -#include <gpxe/nvs.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/io.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/timer.h> +#include <ipxe/nvs.h> #include "3c90x.h" @@ -271,7 +271,7 @@ static int a3c90x_setup_tx_ring(struct INF_3C90X *p) /** * a3c90x_process_tx_packets - Checks for successfully sent packets, - * reports them to gPXE with netdev_tx_complete(); + * reports them to iPXE with netdev_tx_complete(); * * @v netdev Network device info */ @@ -513,7 +513,7 @@ static void a3c90x_free_rx_iobuf(struct INF_3C90X *p) /** * a3c90x_process_rx_packets - Checks for received packets, - * reports them to gPXE with netdev_rx() or netdev_rx_err() if there was an + * reports them to iPXE with netdev_rx() or netdev_rx_err() if there was an * error while receiving the packet * * @v netdev Network device info @@ -608,7 +608,7 @@ static void a3c90x_free_resources(struct INF_3C90X *p) /** * a3c90x_remove - Routine to remove the card. Unregisters - * the NIC from gPXE, disables RX/TX and resets the card. + * the NIC from iPXE, disables RX/TX and resets the card. * * @v pci PCI device info */ diff --git a/src/drivers/net/3c90x.h b/src/drivers/net/3c90x.h index acbb29d2..0d36fbae 100644 --- a/src/drivers/net/3c90x.h +++ b/src/drivers/net/3c90x.h @@ -3,7 +3,7 @@ * by Greg Beeley, Greg.Beeley@LightSys.org. Modified by Steve Smith, * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net). * - * Port from etherboot to gPXE API, implementation of tx/rx ring support + * Port from etherboot to iPXE API, implementation of tx/rx ring support * by Thomas Miletich, thomas.miletich@gmail.com * Thanks to Marty Connor and Stefan Hajnoczi for their help and feedback. * diff --git a/src/drivers/net/amd8111e.c b/src/drivers/net/amd8111e.c index 1b1fdc19..476d5306 100644 --- a/src/drivers/net/amd8111e.c +++ b/src/drivers/net/amd8111e.c @@ -33,8 +33,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include "etherboot.h" #include "nic.h" #include "mii.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include "string.h" #include "stdint.h" #include "amd8111e.h" diff --git a/src/drivers/net/ath5k/ath5k.c b/src/drivers/net/ath5k/ath5k.c index 37defce2..8b2584f7 100644 --- a/src/drivers/net/ath5k/ath5k.c +++ b/src/drivers/net/ath5k/ath5k.c @@ -5,7 +5,7 @@ * Copyright (c) 2007 Jiri Slaby <jirislaby@gmail.com> * Copyright (c) 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> * - * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> + * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> * Original from Linux kernel 2.6.30. * * All rights reserved. @@ -46,11 +46,11 @@ FILE_LICENCE ( BSD3 ); #include <stdlib.h> -#include <gpxe/malloc.h> -#include <gpxe/timer.h> -#include <gpxe/netdevice.h> -#include <gpxe/pci.h> -#include <gpxe/pci_io.h> +#include <ipxe/malloc.h> +#include <ipxe/timer.h> +#include <ipxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/pci_io.h> #include "base.h" #include "reg.h" @@ -1239,7 +1239,7 @@ accept: iob_put(iob, rs.rs_datalen); /* The MAC header is padded to have 32-bit boundary if the - * packet payload is non-zero. However, gPXE only + * packet payload is non-zero. However, iPXE only * supports standard 802.11 packets with 24-byte * header, so no padding correction should be needed. */ @@ -1508,7 +1508,7 @@ ath5k_tx(struct net80211_device *dev, struct io_buffer *iob) /* * The hardware expects the header padded to 4 byte boundaries. - * gPXE only ever sends 24-byte headers, so no action necessary. + * iPXE only ever sends 24-byte headers, so no action necessary. */ if (list_empty(&sc->txbuf)) { diff --git a/src/drivers/net/ath5k/ath5k.h b/src/drivers/net/ath5k/ath5k.h index e54433d7..30e2024c 100644 --- a/src/drivers/net/ath5k/ath5k.h +++ b/src/drivers/net/ath5k/ath5k.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2007 Reyk Floeter <reyk@openbsd.org> * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm@gmail.com> * - * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> + * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> * Original from Linux kernel 2.6.30. * * Permission to use, copy, modify, and distribute this software for any @@ -25,9 +25,9 @@ FILE_LICENCE ( MIT ); #include <stddef.h> #include <byteswap.h> -#include <gpxe/io.h> -#include <gpxe/netdevice.h> -#include <gpxe/net80211.h> +#include <ipxe/io.h> +#include <ipxe/netdevice.h> +#include <ipxe/net80211.h> #include <errno.h> /* Keep all ath5k files under one errfile ID */ diff --git a/src/drivers/net/ath5k/ath5k_attach.c b/src/drivers/net/ath5k/ath5k_attach.c index 36dc2439..302536db 100644 --- a/src/drivers/net/ath5k/ath5k_attach.c +++ b/src/drivers/net/ath5k/ath5k_attach.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org> * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com> * - * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> + * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> * Original from Linux kernel 2.6.30. * * Permission to use, copy, modify, and distribute this software for any @@ -25,7 +25,7 @@ FILE_LICENCE ( MIT ); * Attach/Detach Functions and helpers * \*************************************/ -#include <gpxe/pci.h> +#include <ipxe/pci.h> #include <unistd.h> #include <stdlib.h> #include "ath5k.h" diff --git a/src/drivers/net/ath5k/ath5k_caps.c b/src/drivers/net/ath5k/ath5k_caps.c index 1d60d744..9c00d15d 100644 --- a/src/drivers/net/ath5k/ath5k_caps.c +++ b/src/drivers/net/ath5k/ath5k_caps.c @@ -3,7 +3,7 @@ * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com> * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_desc.c b/src/drivers/net/ath5k/ath5k_desc.c index 76d0c1e4..30fe1c77 100644 --- a/src/drivers/net/ath5k/ath5k_desc.c +++ b/src/drivers/net/ath5k/ath5k_desc.c @@ -3,7 +3,7 @@ * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com> * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_dma.c b/src/drivers/net/ath5k/ath5k_dma.c index 23c4cf91..fa1e0d01 100644 --- a/src/drivers/net/ath5k/ath5k_dma.c +++ b/src/drivers/net/ath5k/ath5k_dma.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org> * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_eeprom.c b/src/drivers/net/ath5k/ath5k_eeprom.c index 0f62c4c7..983d206b 100644 --- a/src/drivers/net/ath5k/ath5k_eeprom.c +++ b/src/drivers/net/ath5k/ath5k_eeprom.c @@ -3,7 +3,7 @@ * Copyright (c) 2006-2009 Nick Kossifidis <mickflemm@gmail.com> * Copyright (c) 2008-2009 Felix Fietkau <nbd@openwrt.org> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_gpio.c b/src/drivers/net/ath5k/ath5k_gpio.c index 0e8a3e68..2301ec70 100644 --- a/src/drivers/net/ath5k/ath5k_gpio.c +++ b/src/drivers/net/ath5k/ath5k_gpio.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org> * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_initvals.c b/src/drivers/net/ath5k/ath5k_initvals.c index 92011c83..8f3bd203 100644 --- a/src/drivers/net/ath5k/ath5k_initvals.c +++ b/src/drivers/net/ath5k/ath5k_initvals.c @@ -5,7 +5,7 @@ * Copyright (c) 2006-2009 Nick Kossifidis <mickflemm@gmail.com> * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_pcu.c b/src/drivers/net/ath5k/ath5k_pcu.c index d3e144c4..c8165da7 100644 --- a/src/drivers/net/ath5k/ath5k_pcu.c +++ b/src/drivers/net/ath5k/ath5k_pcu.c @@ -6,7 +6,7 @@ * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org> * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -43,7 +43,7 @@ FILE_LICENCE ( MIT ); * * Initialize PCU for the various operating modes (AP/STA etc) * - * For gPXE we always assume STA mode. + * For iPXE we always assume STA mode. */ int ath5k_hw_set_opmode(struct ath5k_hw *ah) { diff --git a/src/drivers/net/ath5k/ath5k_phy.c b/src/drivers/net/ath5k/ath5k_phy.c index 8856fa33..dad70602 100644 --- a/src/drivers/net/ath5k/ath5k_phy.c +++ b/src/drivers/net/ath5k/ath5k_phy.c @@ -6,7 +6,7 @@ * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com> * Copyright (c) 2008-2009 Felix Fietkau <nbd@openwrt.org> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_qcu.c b/src/drivers/net/ath5k/ath5k_qcu.c index cb250293..ffa8b4eb 100644 --- a/src/drivers/net/ath5k/ath5k_qcu.c +++ b/src/drivers/net/ath5k/ath5k_qcu.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org> * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/drivers/net/ath5k/ath5k_reset.c b/src/drivers/net/ath5k/ath5k_reset.c index dc80093a..e1eb7130 100644 --- a/src/drivers/net/ath5k/ath5k_reset.c +++ b/src/drivers/net/ath5k/ath5k_reset.c @@ -5,7 +5,7 @@ * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org> * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com> * - * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. + * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -29,7 +29,7 @@ FILE_LICENCE ( MIT ); Reset functions and helpers \*****************************/ -#include <gpxe/pci.h> /* To determine if a card is pci-e */ +#include <ipxe/pci.h> /* To determine if a card is pci-e */ #include <unistd.h> #include "ath5k.h" diff --git a/src/drivers/net/ath5k/ath5k_rfkill.c b/src/drivers/net/ath5k/ath5k_rfkill.c index 9d0a2ff1..752ef70b 100644 --- a/src/drivers/net/ath5k/ath5k_rfkill.c +++ b/src/drivers/net/ath5k/ath5k_rfkill.c @@ -2,7 +2,7 @@ * RFKILL support for ath5k * * Copyright (c) 2009 Tobias Doerffel <tobias.doerffel@gmail.com> - * Lightly modified for gPXE, Sep 2008 by Joshua Oreman <oremanj@rwcr.net> + * Lightly modified for iPXE, Sep 2008 by Joshua Oreman <oremanj@rwcr.net> * * All rights reserved. * diff --git a/src/drivers/net/ath5k/base.h b/src/drivers/net/ath5k/base.h index 870b0ed4..976a3f30 100644 --- a/src/drivers/net/ath5k/base.h +++ b/src/drivers/net/ath5k/base.h @@ -2,7 +2,7 @@ * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * - * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> + * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net> * Original from Linux kernel 2.6.30. * * Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ FILE_LICENCE ( BSD3 ); #include "ath5k.h" -#include <gpxe/iobuf.h> +#include <ipxe/iobuf.h> #define ATH_RXBUF 16 /* number of RX buffers */ #define ATH_TXBUF 16 /* number of TX buffers */ diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c index 6c0b0502..160ad91b 100644 --- a/src/drivers/net/atl1e.c +++ b/src/drivers/net/atl1e.c @@ -4,7 +4,7 @@ * Derived from Intel e1000 driver * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. * - * Modified for gPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>. + * Modified for iPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free diff --git a/src/drivers/net/atl1e.h b/src/drivers/net/atl1e.h index 949c3238..b09dbbc7 100644 --- a/src/drivers/net/atl1e.h +++ b/src/drivers/net/atl1e.h @@ -5,7 +5,7 @@ * Derived from Intel e1000 driver * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. * - * Modified for gPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net> + * Modified for iPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -31,14 +31,14 @@ #include <unistd.h> #include <byteswap.h> #include <errno.h> -#include <gpxe/malloc.h> -#include <gpxe/pci.h> -#include <gpxe/pci_io.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/io.h> +#include <ipxe/malloc.h> +#include <ipxe/pci.h> +#include <ipxe/pci_io.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/io.h> #define ETH_FCS_LEN 4 #define VLAN_HLEN 4 diff --git a/src/drivers/net/b44.c b/src/drivers/net/b44.c index c48b3144..29aa5fa6 100644 --- a/src/drivers/net/b44.c +++ b/src/drivers/net/b44.c @@ -35,15 +35,15 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> #include <unistd.h> #include <byteswap.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <mii.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/pci.h> -#include <gpxe/netdevice.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/memmap.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/pci.h> +#include <ipxe/netdevice.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/memmap.h> #include "b44.h" @@ -628,7 +628,7 @@ static void b44_set_rx_mode(struct net_device *netdev) } -/*** Implementation of gPXE driver callbacks ***/ +/*** Implementation of iPXE driver callbacks ***/ /** * Probe device diff --git a/src/drivers/net/bnx2.c b/src/drivers/net/bnx2.c index c385dd85..a986bdef 100644 --- a/src/drivers/net/bnx2.c +++ b/src/drivers/net/bnx2.c @@ -17,8 +17,8 @@ FILE_LICENCE ( GPL_ANY ); #include "etherboot.h" #include "nic.h" #include <errno.h> -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include "string.h" #include <mii.h> #include "bnx2.h" diff --git a/src/drivers/net/cs89x0.c b/src/drivers/net/cs89x0.c index df2667d9..448ff518 100644 --- a/src/drivers/net/cs89x0.c +++ b/src/drivers/net/cs89x0.c @@ -88,10 +88,10 @@ FILE_LICENCE ( GPL2_ONLY ); */ #include <errno.h> -#include <gpxe/ethernet.h> +#include <ipxe/ethernet.h> #include "etherboot.h" #include "nic.h" -#include <gpxe/isa.h> +#include <ipxe/isa.h> #include "console.h" #include "cs89x0.h" diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c index 07c5e1b2..bfba49d9 100644 --- a/src/drivers/net/davicom.c +++ b/src/drivers/net/davicom.c @@ -45,8 +45,8 @@ FILE_LICENCE ( GPL_ANY ); #include "etherboot.h" #include "nic.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #undef DAVICOM_DEBUG #undef DAVICOM_DEBUG_WHERE diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c index ea85cbe1..6be3e104 100644 --- a/src/drivers/net/depca.c +++ b/src/drivers/net/depca.c @@ -239,9 +239,9 @@ FILE_LICENCE ( GPL_ANY ); #include "etherboot.h" #include "nic.h" -#include <gpxe/isa.h> +#include <ipxe/isa.h> #include "console.h" -#include <gpxe/ethernet.h> +#include <ipxe/ethernet.h> /* ** I/O addresses. Note that the 2k buffer option is not supported in diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c index fad1737a..6975ee7e 100644 --- a/src/drivers/net/dmfe.c +++ b/src/drivers/net/dmfe.c @@ -43,8 +43,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* to get the interface to the body of the program */ #include "nic.h" /* to get the PCI support functions, if this is a PCI NIC */ -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> /* #define EDEBUG 1 */ #ifdef EDEBUG diff --git a/src/drivers/net/e1000/e1000_api.h b/src/drivers/net/e1000/e1000_api.h index d9f13bf0..07be1ce0 100644 --- a/src/drivers/net/e1000/e1000_api.h +++ b/src/drivers/net/e1000/e1000_api.h @@ -36,15 +36,15 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> #include <string.h> #include <unistd.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <errno.h> #include <byteswap.h> -#include <gpxe/pci.h> -#include <gpxe/malloc.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/malloc.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> #include "e1000_hw.h" diff --git a/src/drivers/net/e1000/e1000_main.c b/src/drivers/net/e1000/e1000_main.c index 3421ca1b..fd2c78b9 100644 --- a/src/drivers/net/e1000/e1000_main.c +++ b/src/drivers/net/e1000/e1000_main.c @@ -541,7 +541,7 @@ void e1000_reset ( struct e1000_adapter *adapter ) e1000_init_manageability ( adapter ); } -/** Functions that implement the gPXE driver API **/ +/** Functions that implement the iPXE driver API **/ /** * e1000_close - Disables a network interface diff --git a/src/drivers/net/e1000e/e1000e.h b/src/drivers/net/e1000e/e1000e.h index c057350d..61584138 100644 --- a/src/drivers/net/e1000e/e1000e.h +++ b/src/drivers/net/e1000e/e1000e.h @@ -38,15 +38,15 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> #include <string.h> #include <unistd.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <errno.h> #include <byteswap.h> -#include <gpxe/pci.h> -#include <gpxe/malloc.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/malloc.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> /* Begin OS Dependencies */ diff --git a/src/drivers/net/e1000e/e1000e_main.c b/src/drivers/net/e1000e/e1000e_main.c index d3e919e2..748f0cb6 100644 --- a/src/drivers/net/e1000e/e1000e_main.c +++ b/src/drivers/net/e1000e/e1000e_main.c @@ -860,7 +860,7 @@ static void e1000e_process_rx_packets ( struct net_device *netdev ) } } -/** Functions that implement the gPXE driver API **/ +/** Functions that implement the iPXE driver API **/ /** * e1000_close - Disables a network interface diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c index a248692c..704d11a9 100644 --- a/src/drivers/net/eepro.c +++ b/src/drivers/net/eepro.c @@ -36,8 +36,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include "etherboot.h" #include <errno.h> #include "nic.h" -#include <gpxe/isa.h> -#include <gpxe/ethernet.h> +#include <ipxe/isa.h> +#include <ipxe/ethernet.h> /* Different 82595 chips */ #define LAN595 0 diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c index 3ad45bf2..add17a6d 100644 --- a/src/drivers/net/eepro100.c +++ b/src/drivers/net/eepro100.c @@ -36,7 +36,7 @@ * Jul 25 1997 V1.00 REW Tested by AW to work in a PROM * Cleanup for publication * Dez 11 2004 V1.10 Kiszka Add RX ring buffer support - * Jun 2008 v2.0 mdeck Updated to gPXE. Changed much. + * Jun 2008 v2.0 mdeck Updated to iPXE. Changed much. * * Cleanups and fixes by Thomas Miletich<thomas.miletich@gmail.com> * @@ -60,12 +60,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); * * Initialization * - * ifec_pci_probe() is called by gPXE during initialization. Typical NIC + * ifec_pci_probe() is called by iPXE during initialization. Typical NIC * initialization is performed. EEPROM data is read. * * Network Boot * - * ifec_net_open() is called by gPXE before attempting to network boot from the + * ifec_net_open() is called by iPXE before attempting to network boot from the * card. Here, the Command Unit & Receive Unit are initialized. The tx & rx * rings are setup. The MAC address is programmed and the card is configured. * @@ -104,16 +104,16 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <errno.h> #include <stdio.h> #include <unistd.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/pci.h> -#include <gpxe/spi_bit.h> -#include <gpxe/timer.h> -#include <gpxe/nvs.h> -#include <gpxe/threewire.h> -#include <gpxe/netdevice.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/pci.h> +#include <ipxe/spi_bit.h> +#include <ipxe/timer.h> +#include <ipxe/nvs.h> +#include <ipxe/threewire.h> +#include <ipxe/netdevice.h> #include "eepro100.h" /****************************** Global data **********************************/ @@ -155,7 +155,7 @@ static struct net_device_operations ifec_operations = { .irq = ifec_net_irq }; -/******************* gPXE PCI Device Driver API functions ********************/ +/******************* iPXE PCI Device Driver API functions ********************/ /* * Initialize the PCI device. @@ -164,8 +164,8 @@ static struct net_device_operations ifec_operations = { * @v id The PCI device + vendor id. * @ret rc Returns zero if successfully initialized. * - * This function is called very early on, while gPXE is initializing. - * This is a gPXE PCI Device Driver API function. + * This function is called very early on, while iPXE is initializing. + * This is a iPXE PCI Device Driver API function. */ static int ifec_pci_probe ( struct pci_device *pci, const struct pci_device_id *id __unused ) @@ -245,14 +245,14 @@ static void ifec_pci_remove ( struct pci_device *pci ) netdev_put ( netdev ); } -/****************** gPXE Network Device Driver API functions *****************/ +/****************** iPXE Network Device Driver API functions *****************/ /* * Close a network device. * * @v netdev Device to close. * - * This is a gPXE Network Device Driver API function. + * This is a iPXE Network Device Driver API function. */ static void ifec_net_close ( struct net_device *netdev ) { @@ -285,7 +285,7 @@ static void ifec_net_close ( struct net_device *netdev ) * @v netdev Device to control. * @v enable Zero to mask off IRQ, non-zero to enable IRQ. * - * This is a gPXE Network Driver API function. + * This is a iPXE Network Driver API function. */ static void ifec_net_irq ( struct net_device *netdev, int enable ) { @@ -304,7 +304,7 @@ static void ifec_net_irq ( struct net_device *netdev, int enable ) * @ret rc Non-zero if failed to open. * * This enables tx and rx on the device. - * This is a gPXE Network Device Driver API function. + * This is a iPXE Network Device Driver API function. */ static int ifec_net_open ( struct net_device *netdev ) { @@ -393,9 +393,9 @@ error: * * @v netdev Device being polled. * - * This is called periodically by gPXE to let the driver check the status of + * This is called periodically by iPXE to let the driver check the status of * transmitted packets and to allow the driver to check for received packets. - * This is a gPXE Network Device Driver API function. + * This is a iPXE Network Device Driver API function. */ static void ifec_net_poll ( struct net_device *netdev ) { @@ -431,7 +431,7 @@ static void ifec_net_poll ( struct net_device *netdev ) * @v iobuf Data to transmit. * @ret rc Non-zero if failed to transmit. * - * This is a gPXE Network Driver API function. + * This is a iPXE Network Driver API function. */ static int ifec_net_transmit ( struct net_device *netdev, struct io_buffer *iobuf ) @@ -993,7 +993,7 @@ static void ifec_tx_process ( struct net_device *netdev ) /* Check status of transmitted packets */ while ( ( status = tcb->status ) && tcb->iob ) { if ( status & TCB_U ) { - /* report error to gPXE */ + /* report error to iPXE */ DBG ( "ifec_tx_process : tx error!\n " ); netdev_tx_complete_err ( netdev, tcb->iob, -EINVAL ); } else { diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c index aaa85f80..c8b6a6cd 100644 --- a/src/drivers/net/epic100.c +++ b/src/drivers/net/epic100.c @@ -7,8 +7,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define LINUX_OUT_MACROS #include "etherboot.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include "nic.h" #include "console.h" #include "epic100.h" diff --git a/src/drivers/net/etherfabric.c b/src/drivers/net/etherfabric.c index c4296b9c..bcdd010a 100644 --- a/src/drivers/net/etherfabric.c +++ b/src/drivers/net/etherfabric.c @@ -25,13 +25,13 @@ FILE_LICENCE ( GPL_ANY ); #include <assert.h> #include <byteswap.h> #include <console.h> -#include <gpxe/io.h> -#include <gpxe/pci.h> -#include <gpxe/malloc.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> -#include <gpxe/timer.h> +#include <ipxe/io.h> +#include <ipxe/pci.h> +#include <ipxe/malloc.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> +#include <ipxe/timer.h> #include <mii.h> #include "etherfabric.h" #include "etherfabric_nic.h" diff --git a/src/drivers/net/etherfabric_nic.h b/src/drivers/net/etherfabric_nic.h index fe94d801..a767e12a 100644 --- a/src/drivers/net/etherfabric_nic.h +++ b/src/drivers/net/etherfabric_nic.h @@ -20,11 +20,11 @@ FILE_LICENCE ( GPL_ANY ); #ifndef EFAB_NIC_H #define EFAB_NIC_H -#include <gpxe/bitbash.h> -#include <gpxe/i2c.h> -#include <gpxe/spi.h> -#include <gpxe/nvo.h> -#include <gpxe/if_ether.h> +#include <ipxe/bitbash.h> +#include <ipxe/i2c.h> +#include <ipxe/spi.h> +#include <ipxe/nvo.h> +#include <ipxe/if_ether.h> /************************************************************************** * * Constants and macros diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c index 3d44d86c..3056ce2b 100644 --- a/src/drivers/net/forcedeth.c +++ b/src/drivers/net/forcedeth.c @@ -50,9 +50,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* to get the interface to the body of the program */ #include "nic.h" /* to get the PCI support functions, if this is a PCI NIC */ -#include <gpxe/pci.h> +#include <ipxe/pci.h> /* Include timer support functions */ -#include <gpxe/ethernet.h> +#include <ipxe/ethernet.h> #include "mii.h" #define drv_version "v1.2" diff --git a/src/drivers/net/igb/igb_api.h b/src/drivers/net/igb/igb_api.h index 967d1eee..2d97fecc 100644 --- a/src/drivers/net/igb/igb_api.h +++ b/src/drivers/net/igb/igb_api.h @@ -35,15 +35,15 @@ FILE_LICENCE ( GPL2_ONLY ); #include <stdio.h> #include <string.h> #include <unistd.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <errno.h> #include <byteswap.h> -#include <gpxe/pci.h> -#include <gpxe/malloc.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/malloc.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> #include "igb_hw.h" diff --git a/src/drivers/net/igb/igb_main.c b/src/drivers/net/igb/igb_main.c index 43f016ed..9e2b3bf2 100644 --- a/src/drivers/net/igb/igb_main.c +++ b/src/drivers/net/igb/igb_main.c @@ -626,7 +626,7 @@ static void igb_process_rx_packets ( struct net_device *netdev ) } } -/** Functions that implement the gPXE driver API **/ +/** Functions that implement the iPXE driver API **/ /** * igb_close - Disables a network interface diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c index 4b3741ec..f9fab87c 100644 --- a/src/drivers/net/ipoib.c +++ b/src/drivers/net/ipoib.c @@ -24,14 +24,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <byteswap.h> #include <errno.h> -#include <gpxe/errortab.h> -#include <gpxe/if_arp.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> -#include <gpxe/infiniband.h> -#include <gpxe/ib_pathrec.h> -#include <gpxe/ib_mcast.h> -#include <gpxe/ipoib.h> +#include <ipxe/errortab.h> +#include <ipxe/if_arp.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> +#include <ipxe/infiniband.h> +#include <ipxe/ib_pathrec.h> +#include <ipxe/ib_mcast.h> +#include <ipxe/ipoib.h> /** @file * diff --git a/src/drivers/net/legacy.c b/src/drivers/net/legacy.c index 79b3580a..246a37f7 100644 --- a/src/drivers/net/legacy.c +++ b/src/drivers/net/legacy.c @@ -1,10 +1,10 @@ #include <stdint.h> #include <stdio.h> #include <errno.h> -#include <gpxe/if_ether.h> -#include <gpxe/netdevice.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> +#include <ipxe/if_ether.h> +#include <ipxe/netdevice.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> #include <nic.h> /* diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c index 7cf59b0e..4d17d7ff 100644 --- a/src/drivers/net/mtd80x.c +++ b/src/drivers/net/mtd80x.c @@ -30,8 +30,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* to get the interface to the body of the program */ #include "nic.h" /* to get the PCI support functions, if this is a PCI NIC */ -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include <mii.h> /* Condensed operations for readability. */ diff --git a/src/drivers/net/mtnic.c b/src/drivers/net/mtnic.c index d7ee8d2b..d5dcc032 100644 --- a/src/drivers/net/mtnic.c +++ b/src/drivers/net/mtnic.c @@ -35,22 +35,22 @@ FILE_LICENCE ( GPL2_ONLY ); #include <strings.h> #include <errno.h> -#include <gpxe/malloc.h> -#include <gpxe/umalloc.h> +#include <ipxe/malloc.h> +#include <ipxe/umalloc.h> #include <byteswap.h> #include <unistd.h> -#include <gpxe/io.h> -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> -#include <gpxe/netdevice.h> -#include <gpxe/iobuf.h> +#include <ipxe/io.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> +#include <ipxe/netdevice.h> +#include <ipxe/iobuf.h> #include "mtnic.h" /* - mtnic.c - gPXE driver for Mellanox 10Gig ConnectX EN + mtnic.c - iPXE driver for Mellanox 10Gig ConnectX EN */ diff --git a/src/drivers/net/myri10ge.c b/src/drivers/net/myri10ge.c index ac2e1245..65df5e29 100644 --- a/src/drivers/net/myri10ge.c +++ b/src/drivers/net/myri10ge.c @@ -30,13 +30,13 @@ FILE_LICENCE ( GPL2_ONLY ); * * Initialization * - * myri10ge_pci_probe() is called by gPXE during initialization. + * myri10ge_pci_probe() is called by iPXE during initialization. * Minimal NIC initialization is performed to minimize resources * consumed when the driver is resident but unused. * * Network Boot * - * myri10ge_net_open() is called by gPXE before attempting to network + * myri10ge_net_open() is called by iPXE before attempting to network * boot from the card. Packet buffers are allocated and the NIC * interface is initialized. * @@ -70,13 +70,13 @@ FILE_LICENCE ( GPL2_ONLY ); #include <byteswap.h> #include <errno.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/netdevice.h> -#include <gpxe/pci.h> -#include <gpxe/timer.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/timer.h> #include "myri10ge_mcp.h" @@ -484,7 +484,7 @@ static int mac_address_from_string_specs ( struct pci_device *pci, } /**************************************************************** - * gPXE PCI Device Driver API functions + * iPXE PCI Device Driver API functions ****************************************************************/ /* @@ -494,8 +494,8 @@ static int mac_address_from_string_specs ( struct pci_device *pci, * @v id The PCI device + vendor id. * @ret rc Returns zero if successfully initialized. * - * This function is called very early on, while gPXE is initializing. - * This is a gPXE PCI Device Driver API function. + * This function is called very early on, while iPXE is initializing. + * This is a iPXE PCI Device Driver API function. */ static int myri10ge_pci_probe ( struct pci_device *pci, const struct pci_device_id *id __unused ) @@ -586,7 +586,7 @@ static void myri10ge_pci_remove ( struct pci_device *pci ) } /**************************************************************** - * gPXE Network Device Driver Operations + * iPXE Network Device Driver Operations ****************************************************************/ /* @@ -594,7 +594,7 @@ static void myri10ge_pci_remove ( struct pci_device *pci ) * * @v netdev Device to close. * - * This is a gPXE Network Device Driver API function. + * This is a iPXE Network Device Driver API function. */ static void myri10ge_net_close ( struct net_device *netdev ) { @@ -638,7 +638,7 @@ static void myri10ge_net_close ( struct net_device *netdev ) * @v netdev Device to control. * @v enable Zero to mask off IRQ, non-zero to enable IRQ. * - * This is a gPXE Network Driver API function. + * This is a iPXE Network Driver API function. */ static void myri10ge_net_irq ( struct net_device *netdev, int enable ) { @@ -666,7 +666,7 @@ static void myri10ge_net_irq ( struct net_device *netdev, int enable ) * @ret rc Non-zero if failed to open. * * This enables tx and rx on the device. - * This is a gPXE Network Device Driver API function. + * This is a iPXE Network Device Driver API function. */ static int myri10ge_net_open ( struct net_device *netdev ) { @@ -759,7 +759,7 @@ static int myri10ge_net_open ( struct net_device *netdev ) | netdev->ll_addr[5] ); TRY ( SET_ , MAC_ADDRESS , ); - /* Enable multicast receives, because some gPXE clients don't work + /* Enable multicast receives, because some iPXE clients don't work without multicast. . */ TRY ( ENABLE_ , ALLMULTI , ); @@ -870,9 +870,9 @@ abort_with_nothing: * * @v netdev Device being polled. * - * This is called periodically by gPXE to let the driver check the status of + * This is called periodically by iPXE to let the driver check the status of * transmitted packets and to allow the driver to check for received packets. - * This is a gPXE Network Device Driver API function. + * This is a iPXE Network Device Driver API function. */ static void myri10ge_net_poll ( struct net_device *netdev ) { @@ -951,7 +951,7 @@ static void myri10ge_net_poll ( struct net_device *netdev ) * @v iobuf Data to transmit. * @ret rc Non-zero if failed to transmit. * - * This is a gPXE Network Driver API function. + * This is a iPXE Network Driver API function. */ static int myri10ge_net_transmit ( struct net_device *netdev, struct io_buffer *iobuf ) diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c index db3f3209..2b5375a3 100644 --- a/src/drivers/net/natsemi.c +++ b/src/drivers/net/natsemi.c @@ -1,5 +1,5 @@ /* - natsemi.c - gPXE driver for the NatSemi DP8381x series. + natsemi.c - iPXE driver for the NatSemi DP8381x series. Based on: @@ -51,7 +51,7 @@ FILE_LICENCE ( GPL_ANY ); /* Revision History */ /* - 02 Jul 2007 Udayan Kumar 1.2 ported the driver from etherboot to gPXE API. + 02 Jul 2007 Udayan Kumar 1.2 ported the driver from etherboot to iPXE API. Fully rewritten,adapting the old driver. Added a circular buffer for transmit and receive. transmit routine will not wait for transmission to finish. @@ -64,18 +64,18 @@ FILE_LICENCE ( GPL_ANY ); #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <errno.h> #include <byteswap.h> #include <unistd.h> -#include <gpxe/pci.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> -#include <gpxe/spi_bit.h> -#include <gpxe/threewire.h> -#include <gpxe/nvo.h> +#include <ipxe/pci.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> +#include <ipxe/spi_bit.h> +#include <ipxe/threewire.h> +#include <ipxe/nvo.h> #include "natsemi.h" /* Function Prototypes: */ diff --git a/src/drivers/net/ne2k_isa.c b/src/drivers/net/ne2k_isa.c index 603d1edb..a923fd3c 100644 --- a/src/drivers/net/ne2k_isa.c +++ b/src/drivers/net/ne2k_isa.c @@ -24,8 +24,8 @@ FILE_LICENCE ( BSD2 ); #include "ns8390.h" #include "etherboot.h" #include "nic.h" -#include <gpxe/ethernet.h> -#include <gpxe/isa.h> +#include <ipxe/ethernet.h> +#include <ipxe/isa.h> #include <errno.h> #define ASIC_PIO NE_DATA diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c index c5f21538..c8dc23f8 100644 --- a/src/drivers/net/ns83820.c +++ b/src/drivers/net/ns83820.c @@ -42,7 +42,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* to get the interface to the body of the program */ #include "nic.h" /* to get the PCI support functions, if this is a PCI NIC */ -#include <gpxe/pci.h> +#include <ipxe/pci.h> #if ARCH == ia64 /* Support 64-bit addressing */ #define USE_64BIT_ADDR diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c index 97f1141f..a30f9361 100644 --- a/src/drivers/net/ns8390.c +++ b/src/drivers/net/ns8390.c @@ -41,11 +41,11 @@ FILE_LICENCE ( BSD2 ); #include "etherboot.h" #include "nic.h" #include "ns8390.h" -#include <gpxe/ethernet.h> +#include <ipxe/ethernet.h> #ifdef INCLUDE_NS8390 -#include <gpxe/pci.h> +#include <ipxe/pci.h> #else -#include <gpxe/isa.h> +#include <ipxe/isa.h> #endif static unsigned char eth_vendor, eth_flags; diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c index 223bc1e2..b7b4c025 100644 --- a/src/drivers/net/pcnet32.c +++ b/src/drivers/net/pcnet32.c @@ -43,8 +43,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include "etherboot.h" #include "nic.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include "mii.h" /* void hex_dump(const char *data, const unsigned int len); */ diff --git a/src/drivers/net/phantom/phantom.c b/src/drivers/net/phantom/phantom.c index 41cad188..665bbb02 100644 --- a/src/drivers/net/phantom/phantom.c +++ b/src/drivers/net/phantom/phantom.c @@ -26,15 +26,15 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <errno.h> #include <assert.h> #include <byteswap.h> -#include <gpxe/pci.h> -#include <gpxe/io.h> -#include <gpxe/malloc.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/spi.h> -#include <gpxe/settings.h> +#include <ipxe/pci.h> +#include <ipxe/io.h> +#include <ipxe/malloc.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/spi.h> +#include <ipxe/settings.h> #include "phantom.h" /** @@ -1075,7 +1075,7 @@ static void phantom_poll_link_state ( struct net_device *netdev ) { phantom, xg_state_p3, phantom->link_state ); phantom->link_state = xg_state_p3; - /* Indicate link state to gPXE */ + /* Indicate link state to iPXE */ link = UNM_NIC_REG_XG_STATE_P3_LINK ( phantom->port, phantom->link_state ); switch ( link ) { @@ -1659,7 +1659,7 @@ static int phantom_clp_fetch ( struct phantom_nic *phantom, unsigned int port, /** A Phantom CLP setting */ struct phantom_clp_setting { - /** gPXE setting */ + /** iPXE setting */ struct setting *setting; /** Setting number */ unsigned int clp_setting; @@ -1673,7 +1673,7 @@ static struct phantom_clp_setting clp_settings[] = { /** * Find Phantom CLP setting * - * @v setting gPXE setting + * @v setting iPXE setting * @v clp_setting Setting number, or 0 if not found */ static unsigned int @@ -1716,7 +1716,7 @@ static int phantom_store_setting ( struct settings *settings, unsigned int clp_setting; int rc; - /* Find Phantom setting equivalent to gPXE setting */ + /* Find Phantom setting equivalent to iPXE setting */ clp_setting = phantom_clp_setting ( phantom, setting ); if ( ! clp_setting ) return -ENOTSUP; @@ -1750,7 +1750,7 @@ static int phantom_fetch_setting ( struct settings *settings, int read_len; int rc; - /* Find Phantom setting equivalent to gPXE setting */ + /* Find Phantom setting equivalent to iPXE setting */ clp_setting = phantom_clp_setting ( phantom, setting ); if ( ! clp_setting ) return -ENOTSUP; @@ -1985,7 +1985,7 @@ static void phantom_get_macaddr ( struct phantom_nic *phantom, * one per port. To allow individual ports to be selectively * enabled/disabled for PXE boot (as required), we must therefore * leave the expansion ROM always enabled, and place the per-port - * enable/disable logic within the gPXE driver. + * enable/disable logic within the iPXE driver. */ static int phantom_check_boot_enable ( struct phantom_nic *phantom ) { unsigned long boot_enable; diff --git a/src/drivers/net/pnic.c b/src/drivers/net/pnic.c index cbc67906..ced13971 100644 --- a/src/drivers/net/pnic.c +++ b/src/drivers/net/pnic.c @@ -16,13 +16,13 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <stdio.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <errno.h> -#include <gpxe/pci.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> #include "pnic_api.h" diff --git a/src/drivers/net/prism2.c b/src/drivers/net/prism2.c index 4c665929..d2160148 100644 --- a/src/drivers/net/prism2.c +++ b/src/drivers/net/prism2.c @@ -17,8 +17,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <etherboot.h> #include <nic.h> -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> /* * Hard-coded SSID diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c index b7c1e6bb..72549bab 100644 --- a/src/drivers/net/prism2_pci.c +++ b/src/drivers/net/prism2_pci.c @@ -16,7 +16,7 @@ $Id$ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/pci.h> +#include <ipxe/pci.h> #include <nic.h> #define WLAN_HOSTIF WLAN_PCI diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c index 9fb5be2a..2098f7f0 100644 --- a/src/drivers/net/prism2_plx.c +++ b/src/drivers/net/prism2_plx.c @@ -16,7 +16,7 @@ $Id$ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/pci.h> +#include <ipxe/pci.h> #include <nic.h> #define WLAN_HOSTIF WLAN_PLX diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c index b4687820..b0d9d7fb 100644 --- a/src/drivers/net/r8169.c +++ b/src/drivers/net/r8169.c @@ -33,14 +33,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <assert.h> #include <byteswap.h> #include <errno.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/io.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/netdevice.h> -#include <gpxe/pci.h> -#include <gpxe/timer.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/io.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/timer.h> #include <mii.h> #include "r8169.h" @@ -1577,7 +1577,7 @@ static void rtl_hw_start_8101(struct net_device *dev) // RTL_W16(IntrMask, tp->intr_event); } -/*** gPXE API Support Routines ***/ +/*** iPXE API Support Routines ***/ /** * setup_tx_resources - allocate tx resources (descriptors) @@ -1818,7 +1818,7 @@ rtl8169_free_rx_resources ( struct rtl8169_private *tp ) } /** - FIXME: Because gPXE's pci_device_id structure does not contain a + FIXME: Because iPXE's pci_device_id structure does not contain a field to contain arbitrary data, we need the following table to associate PCI IDs with nic variants, because a lot of driver routines depend on knowing which kind of variant they are dealing @@ -1881,7 +1881,7 @@ static void rtl8169_irq_disable ( struct rtl8169_private *tp ) rtl8169_irq_mask_and_ack ( ioaddr ); } -/*** gPXE Core API Routines ***/ +/*** iPXE Core API Routines ***/ /** * open - Called when a network interface is made active @@ -2103,7 +2103,7 @@ rtl8169_probe ( struct pci_device *pdev, const struct pci_device_id *ent ) struct rtl8169_private *tp; void *ioaddr; - /** FIXME: This lookup is necessary because gPXE does not have a "data" + /** FIXME: This lookup is necessary because iPXE does not have a "data" element in the structure pci_device_id which can pass an arbitrary piece of data to the driver. It might be useful to add it. Then we could just use ent->data instead of having to look up cfg_index. diff --git a/src/drivers/net/r8169.h b/src/drivers/net/r8169.h index 89679b17..174ebb99 100644 --- a/src/drivers/net/r8169.h +++ b/src/drivers/net/r8169.h @@ -32,7 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) /** FIXME: include/linux/pci_regs.h has these PCI regs, maybe - we need such a file in gPXE? + we need such a file in iPXE? **/ #define PCI_EXP_DEVCTL 8 /* Device Control */ #define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */ diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c index 754ce60b..208db097 100644 --- a/src/drivers/net/rtl8139.c +++ b/src/drivers/net/rtl8139.c @@ -72,18 +72,18 @@ FILE_LICENCE ( GPL_ANY ); #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <errno.h> #include <unistd.h> #include <byteswap.h> -#include <gpxe/pci.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> -#include <gpxe/spi_bit.h> -#include <gpxe/threewire.h> -#include <gpxe/nvo.h> +#include <ipxe/pci.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> +#include <ipxe/spi_bit.h> +#include <ipxe/threewire.h> +#include <ipxe/nvo.h> #define TX_RING_SIZE 4 diff --git a/src/drivers/net/rtl818x/rtl8180.c b/src/drivers/net/rtl818x/rtl8180.c index 472ea207..8851d1bf 100644 --- a/src/drivers/net/rtl818x/rtl8180.c +++ b/src/drivers/net/rtl818x/rtl8180.c @@ -2,7 +2,7 @@ FILE_LICENCE(GPL2_OR_LATER); -#include <gpxe/pci.h> +#include <ipxe/pci.h> REQUIRE_OBJECT(rtl818x); REQUIRE_OBJECT(rtl8180_grf5101); diff --git a/src/drivers/net/rtl818x/rtl8180_grf5101.c b/src/drivers/net/rtl818x/rtl8180_grf5101.c index 036a4f8a..2b995030 100644 --- a/src/drivers/net/rtl818x/rtl8180_grf5101.c +++ b/src/drivers/net/rtl818x/rtl8180_grf5101.c @@ -3,7 +3,7 @@ * * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> * - * Modified slightly for gPXE, June 2009 by Joshua Oreman. + * Modified slightly for iPXE, June 2009 by Joshua Oreman. * * Code from the BSD driver and the rtl8181 project have been * very useful to understand certain things @@ -21,8 +21,8 @@ */ #include <unistd.h> -#include <gpxe/pci.h> -#include <gpxe/net80211.h> +#include <ipxe/pci.h> +#include <ipxe/net80211.h> #include "rtl818x.h" diff --git a/src/drivers/net/rtl818x/rtl8180_max2820.c b/src/drivers/net/rtl818x/rtl8180_max2820.c index 7c9495f9..ab380fcc 100644 --- a/src/drivers/net/rtl818x/rtl8180_max2820.c +++ b/src/drivers/net/rtl818x/rtl8180_max2820.c @@ -3,7 +3,7 @@ * * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> * - * Modified slightly for gPXE, June 2009 by Joshua Oreman. + * Modified slightly for iPXE, June 2009 by Joshua Oreman. * * Code from the BSD driver and the rtl8181 project have been * very useful to understand certain things @@ -21,8 +21,8 @@ */ #include <unistd.h> -#include <gpxe/pci.h> -#include <gpxe/net80211.h> +#include <ipxe/pci.h> +#include <ipxe/net80211.h> #include "rtl818x.h" diff --git a/src/drivers/net/rtl818x/rtl8180_sa2400.c b/src/drivers/net/rtl818x/rtl8180_sa2400.c index bcfd397a..9bd62bed 100644 --- a/src/drivers/net/rtl818x/rtl8180_sa2400.c +++ b/src/drivers/net/rtl818x/rtl8180_sa2400.c @@ -3,7 +3,7 @@ * * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> * - * Modified slightly for gPXE, June 2009 by Joshua Oreman. + * Modified slightly for iPXE, June 2009 by Joshua Oreman. * * Code from the BSD driver and the rtl8181 project have been * very useful to understand certain things @@ -21,8 +21,8 @@ */ #include <unistd.h> -#include <gpxe/pci.h> -#include <gpxe/net80211.h> +#include <ipxe/pci.h> +#include <ipxe/net80211.h> #include "rtl818x.h" diff --git a/src/drivers/net/rtl818x/rtl8185.c b/src/drivers/net/rtl818x/rtl8185.c index bfa5ab5c..fd27e5c8 100644 --- a/src/drivers/net/rtl818x/rtl8185.c +++ b/src/drivers/net/rtl818x/rtl8185.c @@ -2,7 +2,7 @@ FILE_LICENCE(GPL2_OR_LATER); -#include <gpxe/pci.h> +#include <ipxe/pci.h> REQUIRE_OBJECT(rtl818x); REQUIRE_OBJECT(rtl8185_rtl8225); diff --git a/src/drivers/net/rtl818x/rtl8185_rtl8225.c b/src/drivers/net/rtl818x/rtl8185_rtl8225.c index b3fc186c..50cc84ad 100644 --- a/src/drivers/net/rtl818x/rtl8185_rtl8225.c +++ b/src/drivers/net/rtl818x/rtl8185_rtl8225.c @@ -4,7 +4,7 @@ * Copyright 2007 Michael Wu <flamingice@sourmilk.net> * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> * - * Modified slightly for gPXE, June 2009 by Joshua Oreman + * Modified slightly for iPXE, June 2009 by Joshua Oreman * * Based on the r8180 driver, which is: * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al. @@ -17,8 +17,8 @@ */ #include <unistd.h> -#include <gpxe/pci.h> -#include <gpxe/net80211.h> +#include <ipxe/pci.h> +#include <ipxe/net80211.h> #include "rtl818x.h" diff --git a/src/drivers/net/rtl818x/rtl818x.c b/src/drivers/net/rtl818x/rtl818x.c index 7c7ca488..f9a46a2f 100644 --- a/src/drivers/net/rtl818x/rtl818x.c +++ b/src/drivers/net/rtl818x/rtl818x.c @@ -5,7 +5,7 @@ * Copyright 2007 Michael Wu <flamingice@sourmilk.net> * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> * - * Modified for gPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net> + * Modified for iPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net> * * Based on the r8180 driver, which is: * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al. @@ -24,12 +24,12 @@ FILE_LICENCE(GPL2_ONLY); #include <stdio.h> #include <unistd.h> #include <byteswap.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/pci.h> -#include <gpxe/net80211.h> -#include <gpxe/netdevice.h> -#include <gpxe/threewire.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/pci.h> +#include <ipxe/net80211.h> +#include <ipxe/netdevice.h> +#include <ipxe/threewire.h> #include "rtl818x.h" diff --git a/src/drivers/net/rtl818x/rtl818x.h b/src/drivers/net/rtl818x/rtl818x.h index 15821fa9..4e57d0bd 100644 --- a/src/drivers/net/rtl818x/rtl818x.h +++ b/src/drivers/net/rtl818x/rtl818x.h @@ -4,7 +4,7 @@ * Copyright 2007 Michael Wu <flamingice@sourmilk.net> * Copyright 2007 Andrea Merello <andreamrl@tiscali.it> * - * Modified for gPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net> + * Modified for iPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net> * * Based on the r8187 driver, which is: * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al. @@ -17,8 +17,8 @@ #ifndef RTL818X_H #define RTL818X_H -#include <gpxe/spi_bit.h> -#include <gpxe/tables.h> +#include <ipxe/spi_bit.h> +#include <ipxe/tables.h> FILE_LICENCE(GPL2_ONLY); diff --git a/src/drivers/net/sis190.c b/src/drivers/net/sis190.c index 5d0145a5..ab81928b 100644 --- a/src/drivers/net/sis190.c +++ b/src/drivers/net/sis190.c @@ -5,7 +5,7 @@ Copyright (c) 2003, 2004 Jeff Garzik <jgarzik@pobox.com> Copyright (c) 2003, 2004, 2005 Francois Romieu <romieu@fr.zoreil.com> - Modified for gPXE 2009 by Thomas Miletich <thomas.miletich@gmail.com> + Modified for iPXE 2009 by Thomas Miletich <thomas.miletich@gmail.com> Based on r8169.c, tg3.c, 8139cp.c, skge.c, epic100.c and SiS 190/191 genuine driver. diff --git a/src/drivers/net/sis190.h b/src/drivers/net/sis190.h index c6dac5b2..fc6cb4b6 100644 --- a/src/drivers/net/sis190.h +++ b/src/drivers/net/sis190.h @@ -13,14 +13,14 @@ FILE_LICENCE ( GPL_ANY ); #include <byteswap.h> #include <errno.h> #include <mii.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/io.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/netdevice.h> -#include <gpxe/pci.h> -#include <gpxe/timer.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/io.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/netdevice.h> +#include <ipxe/pci.h> +#include <ipxe/timer.h> #define PCI_VENDOR_ID_SI 0x1039 diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c index da14a091..630cc2c5 100644 --- a/src/drivers/net/sis900.c +++ b/src/drivers/net/sis900.c @@ -46,7 +46,7 @@ FILE_LICENCE ( GPL_ANY ); /* Includes */ #include "etherboot.h" -#include <gpxe/pci.h> +#include <ipxe/pci.h> #include "nic.h" #include "sis900.h" diff --git a/src/drivers/net/skge.c b/src/drivers/net/skge.c index afe8273e..0508428f 100755 --- a/src/drivers/net/skge.c +++ b/src/drivers/net/skge.c @@ -1,5 +1,5 @@ /* - * gPXE driver for Marvell Yukon chipset and SysKonnect Gigabit + * iPXE driver for Marvell Yukon chipset and SysKonnect Gigabit * Ethernet adapters. Derived from Linux skge driver (v1.13), which was * based on earlier sk98lin, e100 and FreeBSD if_sk drivers. * @@ -9,7 +9,7 @@ * * Copyright (C) 2004, 2005 Stephen Hemminger <shemminger@osdl.org> * - * Modified for gPXE, July 2008 by Michael Decker <mrd999@gmail.com> + * Modified for iPXE, July 2008 by Michael Decker <mrd999@gmail.com> * Tested and Modified in December 2009 by * Thomas Miletich <thomas.miletich@gmail.com> * @@ -33,12 +33,12 @@ FILE_LICENCE ( GPL2_ONLY ); #include <errno.h> #include <stdio.h> #include <unistd.h> -#include <gpxe/netdevice.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/pci.h> +#include <ipxe/netdevice.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/pci.h> #include "skge.h" @@ -1724,7 +1724,7 @@ static int skge_up(struct net_device *dev) assert(!(skge->dma & 7)); - /* FIXME: find out whether 64 bit gPXE will be loaded > 4GB */ + /* FIXME: find out whether 64 bit iPXE will be loaded > 4GB */ if ((u64)skge->dma >> 32 != ((u64) skge->dma + RING_SIZE) >> 32) { DBG(PFX "pci_alloc_consistent region crosses 4G boundary\n"); err = -EINVAL; @@ -2450,7 +2450,7 @@ static void skge_remove(struct pci_device *pdev) * @v netdev Device to control. * @v enable Zero to mask off IRQ, non-zero to enable IRQ. * - * This is a gPXE Network Driver API function. + * This is a iPXE Network Driver API function. */ static void skge_net_irq ( struct net_device *dev, int enable ) { struct skge_port *skge = netdev_priv(dev); diff --git a/src/drivers/net/skge.h b/src/drivers/net/skge.h index 6b08daf2..94088248 100755 --- a/src/drivers/net/skge.h +++ b/src/drivers/net/skge.h @@ -35,7 +35,7 @@ FILE_LICENCE ( GPL2_ONLY ); #define SKGE_EEPROM_MAGIC 0x9933aabb -/* Added for gPXE ------------------ */ +/* Added for iPXE ------------------ */ /* from ethtool.h */ #define AUTONEG_DISABLE 0x00 diff --git a/src/drivers/net/sky2.c b/src/drivers/net/sky2.c index 00940afe..059c7f07 100644 --- a/src/drivers/net/sky2.c +++ b/src/drivers/net/sky2.c @@ -1,5 +1,5 @@ /* - * gPXE driver for Marvell Yukon 2 chipset. Derived from Linux sky2 driver + * iPXE driver for Marvell Yukon 2 chipset. Derived from Linux sky2 driver * (v1.22), which was based on earlier sk98lin and skge drivers. * * This driver intentionally does not support all the features @@ -8,7 +8,7 @@ * * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org> * - * Modified for gPXE, April 2009 by Joshua Oreman + * Modified for iPXE, April 2009 by Joshua Oreman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,11 +30,11 @@ FILE_LICENCE ( GPL2_ONLY ); #include <errno.h> #include <stdio.h> #include <unistd.h> -#include <gpxe/ethernet.h> -#include <gpxe/if_ether.h> -#include <gpxe/iobuf.h> -#include <gpxe/malloc.h> -#include <gpxe/pci.h> +#include <ipxe/ethernet.h> +#include <ipxe/if_ether.h> +#include <ipxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/pci.h> #include <byteswap.h> #include <mii.h> @@ -1016,7 +1016,7 @@ static struct io_buffer *sky2_rx_alloc(struct sky2_port *sky2) * Cards with a RAM buffer hang in the rx FIFO if the * receive buffer isn't aligned to (Linux module comments say * 64 bytes, Linux module code says 8 bytes). Since io_buffers - * are always 2kb-aligned under gPXE, just leave it be + * are always 2kb-aligned under iPXE, just leave it be * without ETH_DATA_ALIGN in those cases. * * XXX This causes unaligned access to the IP header, diff --git a/src/drivers/net/sky2.h b/src/drivers/net/sky2.h index 7963fbe7..3e86b1de 100644 --- a/src/drivers/net/sky2.h +++ b/src/drivers/net/sky2.h @@ -6,7 +6,7 @@ FILE_LICENCE ( GPL2_ONLY ); -/* Added for gPXE ------------------ */ +/* Added for iPXE ------------------ */ /* These were defined in Linux ethtool.h. Their values are arbitrary; they aid only in bookkeeping for the driver. */ diff --git a/src/drivers/net/smc9000.c b/src/drivers/net/smc9000.c index cfbf1047..aa29360b 100644 --- a/src/drivers/net/smc9000.c +++ b/src/drivers/net/smc9000.c @@ -38,11 +38,11 @@ FILE_LICENCE ( GPL_ANY ); #define PRINTK2(args...) #endif -#include <gpxe/ethernet.h> +#include <ipxe/ethernet.h> #include <errno.h> #include "etherboot.h" #include "nic.h" -#include <gpxe/isa.h> +#include <ipxe/isa.h> #include "smc9000.h" # define _outb outb diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c index c446ac08..2ee6089d 100644 --- a/src/drivers/net/sundance.c +++ b/src/drivers/net/sundance.c @@ -47,7 +47,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* to get the interface to the body of the program */ #include "nic.h" /* to get the PCI support functions, if this is a PCI NIC */ -#include <gpxe/pci.h> +#include <ipxe/pci.h> #include "mii.h" #define drv_version "v1.12" diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c index 20027b2e..4ff72ace 100644 --- a/src/drivers/net/tg3.c +++ b/src/drivers/net/tg3.c @@ -17,8 +17,8 @@ FILE_LICENCE ( GPL2_ONLY ); #include "etherboot.h" #include "nic.h" #include <errno.h> -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include "string.h" #include <mii.h> #include "tg3.h" diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c index e5f04fa2..c775620b 100644 --- a/src/drivers/net/tlan.c +++ b/src/drivers/net/tlan.c @@ -42,8 +42,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include "etherboot.h" #include "nic.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include <mii.h> #include "tlan.h" diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c index af30ec64..a53ac71e 100644 --- a/src/drivers/net/tulip.c +++ b/src/drivers/net/tulip.c @@ -111,8 +111,8 @@ FILE_LICENCE ( GPL_ANY ); #include "etherboot.h" #include "nic.h" -#include <gpxe/ethernet.h> -#include <gpxe/pci.h> +#include <ipxe/ethernet.h> +#include <ipxe/pci.h> /* User settable parameters */ diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c index 60e6230d..439a4a5d 100644 --- a/src/drivers/net/via-rhine.c +++ b/src/drivers/net/via-rhine.c @@ -48,8 +48,8 @@ static const char *version = "rhine.c v1.0.2 2004-10-29\n"; #include "etherboot.h" #include "nic.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> /* define all ioaddr */ diff --git a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c index 19625aa6..5b10b6e6 100644 --- a/src/drivers/net/via-velocity.c +++ b/src/drivers/net/via-velocity.c @@ -40,8 +40,8 @@ #include "etherboot.h" #include "nic.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> #include "via-velocity.h" diff --git a/src/drivers/net/virtio-net.c b/src/drivers/net/virtio-net.c index 49fcc1c5..aedfa5fe 100644 --- a/src/drivers/net/virtio-net.c +++ b/src/drivers/net/virtio-net.c @@ -21,8 +21,8 @@ #include "etherboot.h" #include "nic.h" -#include "gpxe/virtio-ring.h" -#include "gpxe/virtio-pci.h" +#include "ipxe/virtio-ring.h" +#include "ipxe/virtio-pci.h" #include "virtio-net.h" #define BUG() do { \ diff --git a/src/drivers/net/vxge/vxge.c b/src/drivers/net/vxge/vxge.c index a24932eb..bf20ec43 100644 --- a/src/drivers/net/vxge/vxge.c +++ b/src/drivers/net/vxge/vxge.c @@ -7,7 +7,7 @@ FILE_LICENCE(GPL2_OR_LATER); -#include <gpxe/pci.h> +#include <ipxe/pci.h> REQUIRE_OBJECT(vxge_main); diff --git a/src/drivers/net/vxge/vxge_config.c b/src/drivers/net/vxge/vxge_config.c index 2cbe4536..76dbfd67 100644 --- a/src/drivers/net/vxge/vxge_config.c +++ b/src/drivers/net/vxge/vxge_config.c @@ -1,5 +1,5 @@ /* - * vxge-config.c: gPXE driver for Neterion Inc's X3100 Series 10GbE PCIe I/O + * vxge-config.c: iPXE driver for Neterion Inc's X3100 Series 10GbE PCIe I/O * Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. @@ -16,8 +16,8 @@ FILE_LICENCE(GPL2_ONLY); #include <stdlib.h> #include <stdio.h> -#include <gpxe/malloc.h> -#include <gpxe/iobuf.h> +#include <ipxe/malloc.h> +#include <ipxe/iobuf.h> #include <byteswap.h> #include "vxge_traffic.h" diff --git a/src/drivers/net/vxge/vxge_config.h b/src/drivers/net/vxge/vxge_config.h index 64f1e8c5..3313123a 100644 --- a/src/drivers/net/vxge/vxge_config.h +++ b/src/drivers/net/vxge/vxge_config.h @@ -1,5 +1,5 @@ /* - * vxge-config.h: gPXE driver for Neterion Inc's X3100 Series 10GbE + * vxge-config.h: iPXE driver for Neterion Inc's X3100 Series 10GbE * PCIe I/O Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. @@ -18,8 +18,8 @@ FILE_LICENCE(GPL2_ONLY); #define VXGE_CONFIG_H #include <stdint.h> -#include <gpxe/list.h> -#include <gpxe/pci.h> +#include <ipxe/list.h> +#include <ipxe/pci.h> #ifndef VXGE_CACHE_LINE_SIZE #define VXGE_CACHE_LINE_SIZE 4096 @@ -314,7 +314,7 @@ struct __vxge_hw_non_offload_db_wrapper { * @vp_id: Virtual path id * @tx_intr_num: Interrupt Number associated with the TX * @txdl: Start pointer of the txdl list of this fifo. - * gPxe does not support tx fragmentation, so we need + * iPXE does not support tx fragmentation, so we need * only one txd in a list * @depth: total number of lists in this fifo * @hw_offset: txd index from where adapter owns the txd list diff --git a/src/drivers/net/vxge/vxge_main.c b/src/drivers/net/vxge/vxge_main.c index 8f5ba475..42855f8d 100644 --- a/src/drivers/net/vxge/vxge_main.c +++ b/src/drivers/net/vxge/vxge_main.c @@ -1,5 +1,5 @@ /* - * vxge-main.c: gPXE driver for Neterion Inc's X3100 Series 10GbE + * vxge-main.c: iPXE driver for Neterion Inc's X3100 Series 10GbE * PCIe I/O Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. @@ -17,16 +17,16 @@ FILE_LICENCE(GPL2_ONLY); #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #include <errno.h> #include <byteswap.h> -#include <gpxe/pci.h> -#include <gpxe/malloc.h> -#include <gpxe/if_ether.h> -#include <gpxe/ethernet.h> -#include <gpxe/iobuf.h> -#include <gpxe/netdevice.h> -#include <gpxe/timer.h> +#include <ipxe/pci.h> +#include <ipxe/malloc.h> +#include <ipxe/if_ether.h> +#include <ipxe/ethernet.h> +#include <ipxe/iobuf.h> +#include <ipxe/netdevice.h> +#include <ipxe/timer.h> #include <nic.h> #include "vxge_main.h" @@ -165,7 +165,7 @@ int vxge_open_vpaths(struct vxgedev *vdev) return VXGE_HW_OK; } -/** Functions that implement the gPXE driver API **/ +/** Functions that implement the iPXE driver API **/ /** * vxge_xmit diff --git a/src/drivers/net/vxge/vxge_main.h b/src/drivers/net/vxge/vxge_main.h index a384b497..fc08ac64 100644 --- a/src/drivers/net/vxge/vxge_main.h +++ b/src/drivers/net/vxge/vxge_main.h @@ -1,5 +1,5 @@ /* - * vxge-main.h: gPXE driver for Neterion Inc's X3100 Series 10GbE + * vxge-main.h: iPXE driver for Neterion Inc's X3100 Series 10GbE * PCIe I/O Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. diff --git a/src/drivers/net/vxge/vxge_reg.h b/src/drivers/net/vxge/vxge_reg.h index 5397cbeb..a76f24e7 100644 --- a/src/drivers/net/vxge/vxge_reg.h +++ b/src/drivers/net/vxge/vxge_reg.h @@ -1,5 +1,5 @@ /* - * vxge-reg.h: gPXE driver for Neterion Inc's X3100 Series 10GbE + * vxge-reg.h: iPXE driver for Neterion Inc's X3100 Series 10GbE * PCIe I/O Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. diff --git a/src/drivers/net/vxge/vxge_traffic.c b/src/drivers/net/vxge/vxge_traffic.c index 425e2890..3bc093cb 100644 --- a/src/drivers/net/vxge/vxge_traffic.c +++ b/src/drivers/net/vxge/vxge_traffic.c @@ -1,5 +1,5 @@ /* - * vxge-traffic.c: gPXE driver for Neterion Inc's X3100 Series 10GbE + * vxge-traffic.c: iPXE driver for Neterion Inc's X3100 Series 10GbE * PCIe I/O Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. @@ -14,7 +14,7 @@ FILE_LICENCE(GPL2_ONLY); -#include <gpxe/netdevice.h> +#include <ipxe/netdevice.h> #include <errno.h> #include "vxge_traffic.h" diff --git a/src/drivers/net/vxge/vxge_traffic.h b/src/drivers/net/vxge/vxge_traffic.h index 84428f57..ed72be1b 100644 --- a/src/drivers/net/vxge/vxge_traffic.h +++ b/src/drivers/net/vxge/vxge_traffic.h @@ -1,5 +1,5 @@ /* - * vxge-traffic.h: gPXE driver for Neterion Inc's X3100 Series 10GbE + * vxge-traffic.h: iPXE driver for Neterion Inc's X3100 Series 10GbE * PCIe I/O Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. @@ -18,8 +18,8 @@ FILE_LICENCE(GPL2_ONLY); #define VXGE_TRAFFIC_H #include <stdint.h> -#include <gpxe/if_ether.h> -#include <gpxe/iobuf.h> +#include <ipxe/if_ether.h> +#include <ipxe/iobuf.h> #include "vxge_reg.h" #include "vxge_version.h" diff --git a/src/drivers/net/vxge/vxge_version.h b/src/drivers/net/vxge/vxge_version.h index 55ad3bf6..f1a02099 100644 --- a/src/drivers/net/vxge/vxge_version.h +++ b/src/drivers/net/vxge/vxge_version.h @@ -1,5 +1,5 @@ /* - * vxge-version.h: gPXE driver for Neterion Inc's X3100 Series 10GbE + * vxge-version.h: iPXE driver for Neterion Inc's X3100 Series 10GbE * PCIe I/O Virtualized Server Adapter. * * Copyright(c) 2002-2010 Neterion Inc. @@ -18,7 +18,7 @@ FILE_LICENCE(GPL2_ONLY); #define VXGE_VERSION_H -/* gpxe vxge driver version fields. +/* ipxe vxge driver version fields. * Note: Each field must be a nibble size */ #define VXGE_VERSION_MAJOR 3 diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c index fa6188af..c9d22a12 100644 --- a/src/drivers/net/w89c840.c +++ b/src/drivers/net/w89c840.c @@ -81,8 +81,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include "etherboot.h" #include "nic.h" -#include <gpxe/pci.h> -#include <gpxe/ethernet.h> +#include <ipxe/pci.h> +#include <ipxe/ethernet.h> static const char *w89c840_version = "driver Version 0.94 - December 12, 2003"; |