# HG changeset patch
# User drencor-xeen
# Date 1355172716 21600
# Node ID 05b7feef845af787c224dbebc543451c38d74a7f
# Parent  1ad5f8473788a7494f529f28f3d16065ca92e1d7# Parent  43300b4f840a9a14b88705aac6e96772656c04cf
Merged Changeset related to krn.asm

diff -r 43300b4f840a -r 05b7feef845a defs/rbf.d
--- a/defs/rbf.d	Thu Dec 06 11:22:23 2012 -0600
+++ b/defs/rbf.d	Mon Dec 10 14:51:56 2012 -0600
@@ -276,8 +276,8 @@
 *************************
 * 2012/11/09 Gene Heskett - Some additions for bootlink etc use.
 		ORG	$60			More options from device descriptor
-DD.STP		RMB	1	This is for the /sh and /ih virtual disks in HDBDOS
-DD.OFS		RMB	3	This is DT.WPC and DT.OSF combined, might be more 
+VD.STP		RMB	1	This is for the /sh and /ih virtual disks in HDBDOS
+VD.OFS		RMB	3	This is DT.WPC and DT.OSF combined, might be more 
 
 * DD.FMT Bit Definitions - valid only if device is a floppy disk
 FMT.SIDE       EQU       %00000001           Single Sided=0, Double Sided=1
diff -r 43300b4f840a -r 05b7feef845a level1/coco/modules/makefile
--- a/level1/coco/modules/makefile	Thu Dec 06 11:22:23 2012 -0600
+++ b/level1/coco/modules/makefile	Mon Dec 10 14:51:56 2012 -0600
@@ -40,6 +40,7 @@
 		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd \
 		ddx0.dd x0.dd x1.dd x2.dd x3.dd \
 		rbsuper.dr lltc3.dr llide.dr \
+#		lltc3.dr llide.dr \
 		ddi0_ide.dd i0_ide.dd i1_ide.dd ih_ide.dd \
 		dds0_tc3.dd s0_tc3.dd s1_tc3.dd s2_tc3.dd s3_tc3.dd s4_tc3.dd \
                 s5_tc3.dd s6_tc3.dd sh_tc3.dd
diff -r 43300b4f840a -r 05b7feef845a level1/modules/kernel/krn.asm
--- a/level1/modules/kernel/krn.asm	Thu Dec 06 11:22:23 2012 -0600
+++ b/level1/modules/kernel/krn.asm	Mon Dec 10 14:51:56 2012 -0600
@@ -5,7 +5,7 @@
 *
 * This is how the memory map looks after the kernel has initialized:
 *
-*     $0000----> ================================== 
+*     $0000----> ==================================
 *               |                                  |
 *               |                                  |
 *  $0020-$0111  |  System Globals (D.FMBM-D.XNMI)  |
@@ -252,13 +252,13 @@
          bita  #CRCOn			CRC on?
          beq   GetMem			branch if not (already cleared earlier)
          inc   <D.CRC			else turn on CRC checking
-GetMem   equ   *
-         clra
-*         ldd   MaxMem+1,u
+*GetMem   ldd   MaxMem+1,u
 *         clrb
 *         cmpd  <D.MLIM
 *         bcc   L0158
 *         std   <D.MLIM
+GetMem   equ   *
+         clra
 L0158    ldx   <D.FMBM
 		IFNE	atari
 * In the Atari, memory $0000-$08FF is used by the system
diff -r 43300b4f840a -r 05b7feef845a level1/modules/rbsuper.asm
--- a/level1/modules/rbsuper.asm	Thu Dec 06 11:22:23 2012 -0600
+++ b/level1/modules/rbsuper.asm	Mon Dec 10 14:51:56 2012 -0600
@@ -21,7 +21,9 @@
 *   H6309 - if set, assembles for 6309
 *   USECS - if set, uses critical section code (slows down driver)
 *   HDBDOS - if set, adds code to handle HDB-DOS partitions
-*
+* And somewhere this flag has been lost GH 2012/11/13
+* Only found when I trashed my systems vdisks
+HDBDOS	set 1
 * Edt/Rev  YYYY/MM/DD  Modified by
 * Comment
 * ------------------------------------------------------------------
diff -r 43300b4f840a -r 05b7feef845a level2/modules/krnp4_regdump.asm
--- a/level2/modules/krnp4_regdump.asm	Thu Dec 06 11:22:23 2012 -0600
+++ b/level2/modules/krnp4_regdump.asm	Mon Dec 10 14:51:56 2012 -0600
@@ -22,6 +22,8 @@
 * ------------------------------------------------------------------
 *   1      1989/02/??  Ron Lammardo
 * Started.
+*   2       2012/11/22 Gene Heskett
+* Remove final cr to save screen space
 
          nam   krnp4 
          ttl   User Register Dump System Call for NitrOS9 Level 2
@@ -102,7 +104,7 @@
          ldd   P$SP,y     get users stack address
          addd  #R$Size    add on for registers which were saved
          bsr   reg000     dump register S
-         lbsr  reg060     send a <CR>
+*         lbsr  reg060     send a <CR>
          leas  60,s       restore stack pointer
          IFNE  H6309
          pulsw
diff -r 43300b4f840a -r 05b7feef845a rules.mak
--- a/rules.mak	Thu Dec 06 11:22:23 2012 -0600
+++ b/rules.mak	Mon Dec 10 14:51:56 2012 -0600
@@ -76,7 +76,8 @@
 OS9FORMAT_SS80	= os9 format -t80 -ss -dd
 OS9FORMAT_DS40	= os9 format -t40 -ds -dd
 OS9FORMAT_DS80	= os9 format -t80 -ds -dd
-OS9FORMAT_DW3	= os9 format -t1024 -ss -dd
+#OS9FORMAT_DW3	= os9 format -t1024 -ss -dd
+OS9FORMAT_DW3	= os9 format -t80 -ds -dd
 OS9GEN		= os9 gen
 OS9RENAME	= os9 rename
 OS9ATTR		= os9 attr -q