[kernel] Small cleanups, add disasm to 1440k distribution

elks/arch/i86/boot/crt0.S

@@ -47,7 +47,7 @@ _start:
         mov     %ax,%ss         // SS=ES=DS
         mov     $tstack,%sp     // can't use kernel interrupt stack, must have temp stack
 
-        call    start_kernel    // fall through into breakpoint if returns
+        call    start_kernel    // no return
 
         .global int3
 int3:   int     $3              // C breakpoint for emu86

elks/arch/i86/drivers/block/bios.c

@@ -225,18 +225,20 @@ int INITPROC bios_gethdinfo(struct drive_infot *drivep) {
 
 void BFPROC bios_disk_park_all(void)
 {
+#ifdef CONFIG_ARCH_IBMPC
     struct drive_infot *drivep;
     unsigned int cyl;
 
     for (drivep = drive_info; drivep < &drive_info[NUM_DRIVES]; drivep++) {
         if (drivep->fdtype != -1)       /* hard drives only */
             continue;
         cyl = drivep->cylinders - 1;    /* expects zero-based cylinder */
-        BD_AX = 0x0C << 8;
+        BD_AX = BIOSHD_SEEK;
         BD_CX = ((cyl & 0xFF) << 8) | ((cyl & 0x300) >> 2) | 1; /* 1 = sector */
         BD_DX = bios_drive_map[drivep - drive_info];
         call_bios(&bdt);
     }
+#endif
 }
 
 #endif

elks/arch/i86/drivers/block/init.c

@@ -35,12 +35,12 @@ int boot_rootdev;       /* set by /bootopts options if configured*/
 
 void INITPROC device_init(void)
 {
-    register struct gendisk *p;
+    struct gendisk *p;
 
     chr_dev_init();
     blk_dev_init();
 
-    set_irq();
+    set_irq();          /* interrupts enabled for possible disk I/O */
 
     for (p = gendisk_head; p; p = p->next)
         setup_dev(p);

elks/fs/Makefile

@@ -36,7 +36,7 @@ include $(BASEDIR)/Makefile-rules
 # Objects to be compiled.
 
 OBJS  = buffer.o super.o devices.o fcntl.o stat.o inode.o file_table.o \
-	block_dev.o namei.o ioctl.o filesystems.o open.o read_write.o \
+	block_dev.o namei.o ioctl.o open.o read_write.o \
 	readdir.o exec.o select.o pipe.o
 ifdef CONFIG_EXEC_COMPRESS
 	OBJS += exodecr.o

elks/fs/minix/inode.c

@@ -438,8 +438,3 @@ struct file_system_type minix_fs_type = {
     minix_read_super,
 	FST_MINIX
 };
-
-int init_minix_fs(void)
-{
-    return 1;
-}

elks/fs/msdos/inode.c

@@ -408,8 +408,3 @@ struct file_system_type msdos_fs_type = {
 	msdos_read_super,
 	FST_MSDOS
 };
-
-int init_msdos_fs(void)
-{
-	return 1;
-}

elks/include/linuxmt/biosparm.h

@@ -75,6 +75,7 @@ struct biosparms {
 #define BIOSHD_WRITE            0x0300
 #define BIOSHD_READ             0x0200
 #define BIOSHD_DRIVE_PARMS      0x0800
+#define BIOSHD_SEEK             0x0C00
 #endif
 
 int call_bios(struct biosparms *);

elks/include/linuxmt/init.h

@@ -22,7 +22,6 @@ struct drive_infot;
 /* kernel init routines*/
 extern int  INITPROC buffer_init(void);
 extern void INITPROC console_init(void);
-extern void INITPROC fs_init(void);
 extern void INITPROC inode_init(void);
 extern void INITPROC irq_init(void);
 extern void save_timer_irq(void);

elks/include/linuxmt/minix_fs.h

@@ -108,8 +108,6 @@ extern int minix_unlink(struct inode *,char *,size_t);
 extern void minix_write_inode(register struct inode *);
 extern void minix_write_super(register struct super_block *);
 
-extern int init_minix_fs(void);
-
 extern struct inode_operations minix_file_inode_operations;
 extern struct inode_operations minix_dir_inode_operations;
 extern struct inode_operations minix_symlink_inode_operations;

elks/include/linuxmt/msdos_fs.h

@@ -158,7 +158,6 @@ extern int msdos_rename(struct inode *old_dir,const char *old_name,int old_len,
 /* inode.c */
 
 extern void msdos_read_inode(struct inode *inode);
-extern int init_msdos_fs(void);
 
 /* dir.c */
 

elks/init/main.c

@@ -167,7 +167,6 @@ static void INITPROC kernel_init(void)
 
     /* set console from /bootopts console= or 0=default*/
     set_console(boot_console);
-
     console_init();                 /* init direct, bios or headless console*/
 
 #ifdef CONFIG_CHAR_DEV_RS
@@ -184,13 +183,11 @@ static void INITPROC kernel_init(void)
         running_qemu = 1;
 #endif
 
-    device_init();
-
 #ifdef CONFIG_SOCKET
     sock_init();
 #endif
 
-    fs_init();
+    device_init();                  /* interrupts enabled here for possible disk I/O */
 
 #ifdef CONFIG_BOOTOPTS
     finalize_options();

elkscmd/Applications

@@ -212,7 +212,7 @@ nano-X/bin/nxworld.map ::lib/nxworld.map :nanox          :1232c :1440k
 basic/basic                     :basic                  :1200k
 advent/advent                     :other                            :1440c
 advent/advent.db ::lib/advent.db  :other                            :1440c
-debug/disasm                      :other                            :1440c
+debug/disasm                      :other                        :1440k
 debug/nm                          :other                            :1440c
 debug/system.sym ::lib/system.sym :other                            :1440c
 debug/testsym                     :other                            :1440c