← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/arch/i386/hci/commands/pxe_cmd.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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/arch/i386/hci/commands/pxe_cmd.c
31
31
 *
32
32
 */
33
33
 
34
 
/** "startpxe" command descriptor */
35
 
static struct command_descriptor startpxe_cmd =
36
 
        COMMAND_DESC ( struct ifcommon_options, ifcommon_opts, 0, MAX_ARGUMENTS,
37
 
                       "[<interface>]" );
 
34
/** "startpxe" options */
 
35
struct startpxe_options {};
 
36
 
 
37
/** "startpxe" option list */
 
38
static struct option_descriptor startpxe_opts[] = {};
38
39
 
39
40
/**
40
41
 * "startpxe" payload
41
42
 *
42
43
 * @v netdev            Network device
 
44
 * @v opts              Command options
43
45
 * @ret rc              Return status code
44
46
 */
45
 
static int startpxe_payload ( struct net_device *netdev ) {
 
47
static int startpxe_payload ( struct net_device *netdev,
 
48
                              struct startpxe_options *opts __unused ) {
46
49
 
47
50
        if ( netdev_is_open ( netdev ) )
48
51
                pxe_activate ( netdev );
50
53
        return 0;
51
54
}
52
55
 
 
56
/** "startpxe" command descriptor */
 
57
static struct ifcommon_command_descriptor startpxe_cmd =
 
58
        IFCOMMON_COMMAND_DESC ( struct startpxe_options, startpxe_opts,
 
59
                                0, MAX_ARGUMENTS, "[<interface>]",
 
60
                                startpxe_payload, 0 );
 
61
 
53
62
/**
54
63
 * The "startpxe" command
55
64
 *
58
67
 * @ret rc              Return status code
59
68
 */
60
69
static int startpxe_exec ( int argc, char **argv ) {
61
 
        return ifcommon_exec ( argc, argv, &startpxe_cmd, startpxe_payload, 0 );
 
70
        return ifcommon_exec ( argc, argv, &startpxe_cmd );
62
71
}
63
72
 
64
73
/** "stoppxe" options */
69
78
 
70
79
/** "stoppxe" command descriptor */
71
80
static struct command_descriptor stoppxe_cmd =
72
 
        COMMAND_DESC ( struct stoppxe_options, stoppxe_opts, 0, 0, "" );
 
81
        COMMAND_DESC ( struct stoppxe_options, stoppxe_opts, 0, 0, NULL );
73
82
 
74
83
/**
75
84
 * The "stoppxe" command