diff --git a/src/Makefile.inc b/src/Makefile.inc index 18373b1..6ab96cc 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -3,8 +3,8 @@ # allow you to change your default compiler without affecting your other work CFLAGS = -CC = gcc34 -CXX = g++34 +CC = gcc +CXX = g++ LD = ld AR = ar REMOVE = rm -rf diff --git a/src/bin/init/main.c b/src/bin/init/main.c index 9ed4a1f..56f6863 100644 --- a/src/bin/init/main.c +++ b/src/bin/init/main.c @@ -1,5 +1,5 @@ /***************************************************************************************** - Copyright (c) 2002-2004,2007,2008 The UbixOS Project + Copyright (c) 2002-2004,2007,2008, 2012 The UbixOS Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, are @@ -52,7 +52,7 @@ exit(0x1); } - printf("Initializing UbixOS\n"); + printf("Initializing uBixOS\n"); #if 0 /* Start TTYD */ diff --git a/src/lib/libc/libc.inc b/src/lib/libc/libc.inc index e7d4cac..8c0f369 100644 --- a/src/lib/libc/libc.inc +++ b/src/lib/libc/libc.inc @@ -1,4 +1,4 @@ -CC = gcc34 +CC = gcc REMOVE = rm -fr .if defined(PICA) diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 459a908..cced4a9 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -119,6 +119,7 @@ /* Mount Root */ + kprintf("Mounting SYS\n"); if (vfs_mount(0x1,0x2,0x0,0xAA,"sys","rw") != 0x0) { kprintf("Problem Mounting sys Mount Point\n"); } @@ -140,6 +141,7 @@ execThread(systemTask, (uInt32)sysTask+0x2000,0x0); /* Execute Init Process */ + kprintf("Starting init\n"); execFile("sys:/bin/init",0x0,0x0,0x0); /* OS Initializer */ // execFile("sys:/bin/login",0x0,0x0,0x1); diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 7517aee..7ccc5f9 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -193,7 +193,9 @@ tmpFd = (struct file *)kmalloc(sizeof(struct file)); //KUBU memset(tmpFd,0x0,sizeof(struct file)); + kprintf("open File\n"); fopen(tmpFd,file,"r"); + kprintf("file opened\n"); /* If We Dont Find the File Return */ if (tmpFd == 0x0) { diff --git a/src/sys/pci/hd.c b/src/sys/pci/hd.c index 8809376..294b325 100644 --- a/src/sys/pci/hd.c +++ b/src/sys/pci/hd.c @@ -105,8 +105,8 @@ hdd2 = (struct driveInfo *)kmalloc(sizeof(struct driveInfo)); memcpy(devInfo2,devInfo,sizeof(struct device_interface)); memcpy(hdd2,hdd,sizeof(struct driveInfo)); - //hdd2->parOffset = d[i].dp_start + bsdd->d_partitions[x].p_offset; - hdd2->parOffset = bsdd->d_partitions[x].p_offset; + hdd2->parOffset = d[i].dp_start + bsdd->d_partitions[x].p_offset; + //UBUhdd2->parOffset = bsdd->d_partitions[x].p_offset; devInfo2->info = hdd2; minor++; @@ -357,6 +357,9 @@ /*** $Log$ + Revision 1.3 2009/07/08 21:20:13 reddawg + Getting There + Revision 1.2 2008/02/29 14:56:31 reddawg Sync - Working On Getting It To Boot Again diff --git a/src/sys/ufs/ufs.c b/src/sys/ufs/ufs.c index 532a52f..c77163e 100644 --- a/src/sys/ufs/ufs.c +++ b/src/sys/ufs/ufs.c @@ -115,6 +115,7 @@ for (n = 0; sblock_try[n] != -1; n++) { if (dskread(fs, sblock_try[n] / DEV_BSIZE, 16,fd)) return -1; + kprintf("MAGIC: [%x:%i]\n",fs->fs_magic,sblock_try[n]); if (( #if defined(UFS1_ONLY) fs->fs_magic == FS_UFS1_MAGIC