← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ipxe/trusty

~ubuntu-branches/ubuntu/trusty/ipxe/trusty

« back to all changes in this revision

Viewing changes to src/arch/i386/drivers/net/undiload.c

Committer: Package Import Robot
Author(s): James Page
Date: 2013-11-26 17:50:47 UTC
mfrom: (1.1.5) (17.1.1 trusty-proposed)
Revision ID: package-import@ubuntu.com-20131126175047-8uf02a31ul9wpqgx

Tags: 1.0.0+git-20131111.c3d1e78-1ubuntu1

* Merge from Debian unstable, remaining changes:
  - d/p/enable-https.patch: Enable HTTPS support.
  - d/control,grub-ipxe*: Split grub integration from ipxe->grub-ipxe.
  - d/control: Transition kvm-ipxe->ipxe-qemu for LTS->LTS upgrade.
  - d/ipxe-qemu.links: Add compat links from /usr/share/qemu to
    /usr/lib/ipxe/qemu.
  - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
* All other changes dropped in preference to upstream Debian
  packaging.
* d/control: Add libiberty-dev to BD's to fix FTBFS.

files added:
.pc/rom-change-banner-timeout.diff

.pc/rom-change-banner-timeout.diff/src

.pc/rom-change-banner-timeout.diff/src/arch

.pc/rom-change-banner-timeout.diff/src/arch/i386

.pc/rom-change-banner-timeout.diff/src/arch/i386/prefix

.pc/rom-change-banner-timeout.diff/src/arch/i386/prefix/romprefix.S

debian/bin

debian/bin/efirom-combine.py

debian/config

debian/config/general.h

debian/ipxe-qemu.install

debian/ipxe-qemu.install.old

debian/ipxe-qemu.links

debian/patches/rom-change-banner-timeout.diff

debian/tree

debian/tree/ipxe

debian/tree/ipxe/etc

debian/tree/ipxe/etc/grub.d

debian/tree/ipxe/etc/grub.d/20_ipxe

src/arch/i386/core/cachedhcp.c

src/arch/i386/interface/pcbios/apm.c

src/arch/x86/core/cpuid_settings.c

src/config/config_route.c

src/config/settings.h

src/core/memmap_settings.c

src/core/params.c

src/core/pinger.c

src/drivers/bus/pci_settings.c

src/drivers/net/rhine.c

src/drivers/net/rhine.h

src/drivers/net/velocity.c

src/drivers/net/velocity.h

src/hci/commands/neighbour_cmd.c

src/hci/commands/param_cmd.c

src/hci/commands/pci_cmd.c

src/hci/commands/ping_cmd.c

src/hci/commands/poweroff_cmd.c

src/include/ipxe/fragment.h

src/include/ipxe/icmpv6.h

src/include/ipxe/ipv6.h

src/include/ipxe/linux/linux_pci.h

src/include/ipxe/mount.h

src/include/ipxe/neighbour.h

src/include/ipxe/nfs.h

src/include/ipxe/nfs_open.h

src/include/ipxe/oncrpc.h

src/include/ipxe/oncrpc_iob.h

src/include/ipxe/params.h

src/include/ipxe/ping.h

src/include/ipxe/pinger.h

src/include/ipxe/portmap.h

src/include/usr/neighmgmt.h

src/include/usr/pingmgmt.h

src/include/usr/sync.h

src/interface/linux/linux_pci.c

src/net/fragment.c

src/net/icmpv4.c

src/net/neighbour.c

src/net/oncrpc

src/net/oncrpc/mount.c

src/net/oncrpc/nfs.c

src/net/oncrpc/nfs_open.c

src/net/oncrpc/oncrpc_iob.c

src/net/oncrpc/portmap.c

src/net/ping.c

src/net/socket.c

src/net/tcp/oncrpc.c

src/tests/base16_test.c

src/tests/ipv6_test.c

src/tests/vsprintf_test.c

src/usr/neighmgmt.c

src/usr/pingmgmt.c

src/usr/route_ipv4.c

src/usr/route_ipv6.c

src/usr/sync.c

files removed:
.pc/disable-baddrivers.diff

.pc/disable-baddrivers.diff/src

.pc/disable-baddrivers.diff/src/Makefile

.pc/qemu-target.diff

.pc/qemu-target.diff/src

.pc/qemu-target.diff/src/Makefile.housekeeping

.pc/rom-set-banner-timeout-0.diff

.pc/rom-set-banner-timeout-0.diff/src

.pc/rom-set-banner-timeout-0.diff/src/arch

.pc/rom-set-banner-timeout-0.diff/src/arch/i386

.pc/rom-set-banner-timeout-0.diff/src/arch/i386/prefix

.pc/rom-set-banner-timeout-0.diff/src/arch/i386/prefix/romprefix.S

debian/grub.d

debian/grub.d/25_ipxe

debian/patches/disable-baddrivers.diff

debian/patches/qemu-target.diff

debian/patches/rom-set-banner-timeout-0.diff

src/arch/i386/interface/pxeparent/pxeparent_dhcp.c

src/drivers/infiniband/linda.c

src/drivers/infiniband/linda.h

src/drivers/infiniband/linda_fw.c

src/drivers/net/bnx2.c

src/drivers/net/bnx2.h

src/drivers/net/bnx2_fw.h

src/drivers/net/via-rhine.c

src/drivers/net/via-velocity.c

src/drivers/net/via-velocity.h

src/include/ipxe/icmp6.h

src/include/ipxe/ip6.h

src/net/cachedhcp.c

files modified:
.pc/applied-patches

.pc/enable-https.patch/src/config/general.h

debian/changelog

debian/compat

debian/control

debian/copyright

debian/grub-ipxe.install

debian/grub-ipxe.postinst

debian/grub-ipxe.postrm

debian/ipxe.install

debian/ipxe.links

debian/patches/enable-https.patch

debian/patches/series

debian/rules

src/Makefile

src/Makefile.housekeeping

src/arch/i386/drivers/net/undiload.c

src/arch/i386/firmware/pcbios/bios_console.c

src/arch/i386/hci/commands/pxe_cmd.c

src/arch/i386/image/bootsector.c

src/arch/i386/image/elfboot.c

src/arch/i386/image/nbi.c

src/arch/i386/interface/pxeparent/pxeparent.c

src/arch/i386/interface/vmware/guestinfo.c

src/arch/i386/prefix/pxeprefix.S

src/arch/i386/prefix/romprefix.S

src/arch/i386/scripts/i386-kir.lds

src/arch/i386/scripts/i386.lds

src/arch/i386/scripts/linux.lds

src/arch/x86/core/cpuid.c

src/arch/x86/core/linux/linux_api.c

src/arch/x86/hci/commands/cpuid_cmd.c

src/arch/x86/include/bits/errfile.h

src/arch/x86/include/ipxe/cpuid.h

src/arch/x86/include/valgrind/memcheck.h

src/arch/x86/include/valgrind/valgrind.h

src/arch/x86/scripts/efi.lds

src/arch/x86_64/scripts/linux.lds

src/config/config.c

src/config/defaults/efi.h

src/config/defaults/linux.h

src/config/general.h

src/config/sideband.h

src/core/base16.c

src/core/downloader.c

src/core/errno.c

src/core/exec.c

src/core/interface.c

src/core/job.c

src/core/misc.c

src/core/monojob.c

src/core/null_reboot.c

src/core/parseopt.c

src/core/pending.c

src/core/resolv.c

src/core/settings.c

src/core/uri.c

src/crypto/clientcert.c

src/crypto/rootcert.c

src/drivers/bus/pci.c

src/drivers/linux/tap.c

src/drivers/net/3c90x.c

src/drivers/net/3c90x.h

src/drivers/net/ath/ath.h

src/drivers/net/ath/ath9k/ani.h

src/drivers/net/ath/ath9k/ar5008_initvals.h

src/drivers/net/ath/ath9k/ar9001_initvals.h

src/drivers/net/ath/ath9k/ar9002_initvals.h

src/drivers/net/ath/ath9k/ar9002_phy.h

src/drivers/net/ath/ath9k/ar9003_eeprom.h

src/drivers/net/ath/ath9k/ath9k.h

src/drivers/net/ath/ath9k/ath9k_ar9002_hw.c

src/drivers/net/ath/ath9k/ath9k_init.c

src/drivers/net/ath/ath9k/calib.h

src/drivers/net/ath/ath9k/common.h

src/drivers/net/ath/ath9k/eeprom.h

src/drivers/net/ath/ath9k/hw-ops.h

src/drivers/net/ath/ath9k/hw.h

src/drivers/net/ath/ath9k/mac.h

src/drivers/net/ath/ath9k/phy.h

src/drivers/net/ath/ath9k/reg.h

src/drivers/net/ath/reg.h

src/drivers/net/ath/regd.h

src/drivers/net/intel.c

src/drivers/net/ipoib.c

src/drivers/net/realtek.c

src/drivers/net/realtek.h

src/hci/commands/autoboot_cmd.c

src/hci/commands/config_cmd.c

src/hci/commands/dhcp_cmd.c

src/hci/commands/fcmgmt_cmd.c

src/hci/commands/ifmgmt_cmd.c

src/hci/commands/image_cmd.c

src/hci/commands/image_trust_cmd.c

src/hci/commands/iwmgmt_cmd.c

src/hci/commands/login_cmd.c

src/hci/commands/lotest_cmd.c

src/hci/commands/menu_cmd.c

src/hci/commands/nvo_cmd.c

src/hci/commands/reboot_cmd.c

src/hci/commands/route_cmd.c

src/hci/commands/sanboot_cmd.c

src/hci/commands/sync_cmd.c

src/hci/commands/vlan_cmd.c

src/hci/shell.c

src/hci/tui/menu_ui.c

src/hci/tui/settings_ui.c

src/image/script.c

src/include/big_bswap.h

src/include/compiler.h

src/include/hci/ifmgmt_cmd.h

src/include/ipxe/arp.h

src/include/ipxe/base16.h

src/include/ipxe/device.h

src/include/ipxe/dhcp.h

src/include/ipxe/efi/ProcessorBind.h

src/include/ipxe/efi/efi.h

src/include/ipxe/errfile.h

src/include/ipxe/ethernet.h

src/include/ipxe/features.h

src/include/ipxe/icmp.h

src/include/ipxe/in.h

src/include/ipxe/ip.h

src/include/ipxe/job.h

src/include/ipxe/linux.h

src/include/ipxe/menu.h

src/include/ipxe/monojob.h

src/include/ipxe/ndp.h

src/include/ipxe/netdevice.h

src/include/ipxe/parseopt.h

src/include/ipxe/pci.h

src/include/ipxe/pci_io.h

src/include/ipxe/pending.h

src/include/ipxe/reboot.h

src/include/ipxe/settings.h

src/include/ipxe/socket.h

src/include/ipxe/tcp.h

src/include/ipxe/tcpip.h

src/include/ipxe/uri.h

src/include/linux_api.h

src/include/little_bswap.h

src/include/stdlib.h

src/include/sys/time.h

src/include/time.h

src/include/usr/dhcpmgmt.h

src/include/usr/ifmgmt.h

src/include/usr/prompt.h

src/include/usr/route.h

src/interface/efi/efi_reboot.c

src/interface/linux/linux_time.c

src/interface/linux/linux_timer.c

src/interface/smbios/smbios_settings.c

src/net/80211/net80211.c

src/net/arp.c

src/net/ethernet.c

src/net/icmp.c

src/net/icmpv6.c

src/net/ipv4.c

src/net/ipv6.c

src/net/ndp.c

src/net/netdev_settings.c

src/net/netdevice.c

src/net/tcp.c

src/net/tcp/httpcore.c

src/net/tcpip.c

src/net/udp.c

src/net/udp/dhcp.c

src/net/vlan.c

src/tests/settings_test.c

src/tests/tests.c

src/usr/autoboot.c

src/usr/dhcpmgmt.c

src/usr/fcmgmt.c

src/usr/ifmgmt.c

src/usr/imgmgmt.c

src/usr/imgtrust.c

src/usr/lotest.c

src/usr/nslookup.c

src/usr/prompt.c

src/usr/route.c

Show diffs side-by-side

added added

removed removed

src/arch/i386/drivers/net/undiload.c

103

103

104

104

/* Call loader */

105

105

undi_loader_entry = undirom->loader_entry;

106

__asm__ __volatile__ ( REAL_CODE ( "pushw %%ds\n\t"

106

__asm__ __volatile__ ( REAL_CODE ( "pushl %%ebp\n\t" /* gcc bug */

107

"pushw %%ds\n\t"

107

108

"pushw %%ax\n\t"

108

109

"lcall *undi_loader_entry\n\t"

109

"addw $4, %%sp\n\t" )

110

"popl %%ebp\n\t" /* discard */

111

"popl %%ebp\n\t" /* gcc bug */ )

110

112

: "=a" ( exit )

111

113

: "a" ( __from_data16 ( &undi_loader ) )

112

: "ebx", "ecx", "edx", "esi", "edi", "ebp" );

114

: "ebx", "ecx", "edx", "esi", "edi" );

113

115

114

116

if ( exit != PXENV_EXIT_SUCCESS ) {

115

117

/* Clear entry point */

Older »