 @@ -1,14 +1,14 @@
-/*	$NetBSD: dev_net.c,v 1.9 2009/03/14 15:36:08 dsl Exp $	*/
+/*	$NetBSD: dev_net.c,v 1.10 2009/12/13 23:01:42 jakllsch Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gordon W. Ross.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -117,27 +117,26 @@ net_close(struct open_file *f)
 	f->f_devdata = NULL;
 	/* Extra close call? */
 	if (netdev_opens <= 0)
 		return (0);
 	netdev_opens--;
 	/* Not last close? */
 	if (netdev_opens > 0)
 		return(0);
 	rootip.s_addr = 0;
 	if (netdev_sock >= 0) {
 		if (debug)
 			printf("net_close: calling netif_close()\n");
 		pxe_netif_close(netdev_sock);
 		//pxe_netif_shutdown(); /* XXX shouldn't be done here */
 		netdev_sock = -1;
+	}
 	return (0);
+}
 int
 net_ioctl(struct open_file *f, u_long cmd, void *data)
+{
 	return EIO;
+}
 int
 net_strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf, size_t *rsize)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.21 2009/09/14 11:56:27 jmcneill Exp $	*/
+/*	$NetBSD: main.c,v 1.22 2009/12/13 23:01:42 jakllsch Exp $	*/
 /*
  * Copyright (c) 1996
  * 	Matthias Drochner.  All rights reserved.
  * Copyright (c) 1996
  * 	Perry E. Metzger.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -75,30 +75,37 @@ const struct bootblk_command commands[]
 	{ "load",	module_add },
 	{ "vesa",	command_vesa },
 	{ NULL,		NULL },
 };
 static void
 clearit(void)
+{
 	if (bootconf.clear)
 		clear_pc_screen();
+}
 static void
 alldone(void)
+{
 	pxe_fini();
 	clearit();
+}
 static int
 bootit(const char *filename, int howto)
+{
-	if (exec_netbsd(filename, 0, howto, 0, clearit) < 0)
+	if (exec_netbsd(filename, 0, howto, 0, alldone) < 0)
 		printf("boot: %s\n", strerror(errno));
 	else
 		printf("boot returned\n");
 	return (-1);
+}
 static void
 print_banner(void)
+{
 	int base = getbasemem();
 	int ext = getextmem();
 	clearit();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pxe.c,v 1.16 2009/10/26 19:16:56 cegger Exp $	*/
+/*	$NetBSD: pxe.c,v 1.17 2009/12/13 23:01:42 jakllsch Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -242,33 +242,26 @@ pxe_netif_close(int sock)
 	if (sock != 0)
 		printf("pxe_netif_close: sock=%d\n", sock);
 #endif
 	uc->status = 0;
 	pxe_call(PXENV_UDP_CLOSE);
 	if (uc->status != PXENV_STATUS_SUCCESS)
 		printf("pxe_netif_end: PXENV_UDP_CLOSE failed: 0x%x\n",
 		    uc->status);
+}
 void
 pxe_netif_shutdown(void)
 	pxe_fini();
 struct iodesc *
 socktodesc(int sock)
+{
 #ifdef NETIF_DEBUG
 	if (sock != 0)
 		return (0);
 	else
 #endif
 		return (&desc);
+}
 /*****************************************************************************

 @@ -1,5 +1,4 @@
-/* $NetBSD: pxe_netif.h,v 1.1 2003/03/12 17:33:10 drochner Exp $ */
+/* $NetBSD: pxe_netif.h,v 1.2 2009/12/13 23:01:42 jakllsch Exp $ */
 int pxe_netif_open(void);
 void pxe_netif_close(int);
 void pxe_netif_shutdown(void);