Various fixups and corrections to match the 3.0-RELEASE tree.

The PicoBSD version is now 0.42.

8 files changed, 25 insertions, 26 deletions

diff --git a/release/picobsd/tinyware/kget/uc_eisa.c b/release/picobsd/tinyware/kget/uc_eisa.c
index aed003e..c0483fc 100644
--- a/release/picobsd/tinyware/kget/uc_eisa.c
+++ b/release/picobsd/tinyware/kget/uc_eisa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_eisa.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_eisa.c,v 1.5 1998/09/14 19:14:11 jkh Exp $
  */
 
 #include <sys/types.h>
@@ -142,7 +142,7 @@ eisa_fill_in(struct kernel *kp, struct uc_eisa *epc, struct eisa_device_node *ed
 				     sizeof(struct eisa_driver));
 
   n=(char *)kv_to_u(kp, (u_int)edrv->name, 20);
-  asprintf(&epc->device, "%s%d", n, edn->dev.unit);
+  asprintf(&epc->device, "%s%lu", n, edn->dev.unit);
   free(n);
 
   n=(char *)kv_to_u(kp, (u_int)edn->dev.full_name, 40); /*XXX*/
diff --git a/release/picobsd/tinyware/kget/uc_isa.c b/release/picobsd/tinyware/kget/uc_isa.c
index b65e8d9..6a5d750 100644
--- a/release/picobsd/tinyware/kget/uc_isa.c
+++ b/release/picobsd/tinyware/kget/uc_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_isa.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_isa.c,v 1.5 1998/10/06 07:41:48 msmith Exp $
  */
 
 #include <sys/types.h>
@@ -44,7 +44,8 @@ get_isa_info(struct kernel *kp){
   char *name;
 
   if(kp->nl[ISA_BIOTAB].n_value || kp->nl[ISA_TTYTAB].n_value || kp->nl[ISA_NETTAB].n_value ||
-     kp->nl[ISA_NULLTAB].n_value || kp->nl[ISA_WDCTAB].n_value || kp->nl[ISA_FDCTAB].n_value) {
+     kp->nl[ISA_CAMTAB].n_value || kp->nl[ISA_NULLTAB].n_value || 
+     kp->nl[ISA_WDCTAB].n_value || kp->nl[ISA_FDCTAB].n_value) {
 
     idp = kp->isa_devp = (struct uc_isa *)malloc(sizeof(struct uc_isa));
     total=0; /* a running total of the number of isa devices */
@@ -158,10 +159,6 @@ get_isa_device(struct uc_isa *ip){
   list_append(list, tmp);
   free(tmp);
 
-  asprintf(&tmp, "%d", ip->modified );
-  list_append(list, tmp);
-  free(tmp);
-
   return(list);
 }
 
diff --git a/release/picobsd/tinyware/kget/uc_kmem.c b/release/picobsd/tinyware/kget/uc_kmem.c
index 38651e8..159fb15 100644
--- a/release/picobsd/tinyware/kget/uc_kmem.c
+++ b/release/picobsd/tinyware/kget/uc_kmem.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_kmem.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_kmem.c,v 1.3 1997/02/22 14:12:28 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/kget/uc_list.c b/release/picobsd/tinyware/kget/uc_list.c
index d0e5ac6..e2b6bd5 100644
--- a/release/picobsd/tinyware/kget/uc_list.c
+++ b/release/picobsd/tinyware/kget/uc_list.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_list.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_list.c,v 1.3 1997/02/22 14:12:29 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/kget/uc_main.c b/release/picobsd/tinyware/kget/uc_main.c
index 97f207c..2f39a11 100644
--- a/release/picobsd/tinyware/kget/uc_main.c
+++ b/release/picobsd/tinyware/kget/uc_main.c
@@ -46,6 +46,7 @@ FILE *f_out;
 static struct nlist _nl[] = {
     {"_isa_devtab_bio"},
     {"_isa_devtab_tty"},
+    {"_isa_devtab_cam"},
     {"_isa_devtab_net"},
     {"_isa_devtab_null"},
     {"_isa_biotab_wdc"},
diff --git a/release/picobsd/tinyware/kget/uc_main.h b/release/picobsd/tinyware/kget/uc_main.h
index 4f7662e..326b806 100644
--- a/release/picobsd/tinyware/kget/uc_main.h
+++ b/release/picobsd/tinyware/kget/uc_main.h
@@ -23,25 +23,26 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_main.h,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_main.h,v 1.5 1998/10/06 07:41:49 msmith Exp $
  */
 
 #define ISA_BIOTAB 0  
 #define ISA_TTYTAB 1
 #define ISA_NETTAB 2
-#define ISA_NULLTAB 3
-#define ISA_WDCTAB 4  
-#define ISA_FDCTAB 5
-#define EISA_SET 6
-#define EISA_LIST 7
-#define PCI_SET 8
-#define SCSI_LIST 9
-#define SCSI_BUSSES 10
-#define SCSI_CINIT 11
-#define SCSI_DINIT 12
-#define SCSI_TINIT 13
+#define ISA_CAMTAB 3
+#define ISA_NULLTAB 4
+#define ISA_WDCTAB 5
+#define ISA_FDCTAB 6
+#define EISA_SET 7
+#define EISA_LIST 8
+#define PCI_SET 9
+#define SCSI_LIST 10
+#define SCSI_BUSSES 11
+#define SCSI_CINIT 12
+#define SCSI_DINIT 13
+#define SCSI_TINIT 14
 /* symbols + the null terminator */
-#define NSYMBOLS 15
+#define NSYMBOLS 16
 
 struct kernel {
   int     fd;    /* file descriptor for the kernel image, either a binary or /dev/kmem */
diff --git a/release/picobsd/tinyware/kget/uc_pci.c b/release/picobsd/tinyware/kget/uc_pci.c
index ca60790..0d8e601 100644
--- a/release/picobsd/tinyware/kget/uc_pci.c
+++ b/release/picobsd/tinyware/kget/uc_pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_pci.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_pci.c,v 1.4 1997/02/22 14:12:33 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c
index 8cadb87..01f8b97 100644
--- a/release/picobsd/tinyware/oinit/oinit.c
+++ b/release/picobsd/tinyware/oinit/oinit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: oinit.c,v 1.8 1998/08/11 06:53:47 abial Exp $
+ *	$Id: oinit.c,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $
  */
 
 /*
@@ -484,7 +484,7 @@ do_command(int shell, char *cmdline)
 	default:
 		while(waitpid(pid,&res,0)!=pid) continue;
 		if(WEXITSTATUS(res)) {
-			printf("%s exited with status %d\n",
+			printf("do_command(%s): exit code=%d\n",
 				av[0],WEXITSTATUS(res));
 		}
 		break;