Anything good here? Diff of elks -> nanox

diff -Naurw elks/arch/i86/drivers/block/doshd.c ../nanox-read-only/arch/i86/drivers/block/doshd.c
@@ -168,7 +168,7 @@
 	if ((BD_AX != 0x100) && (!CARRY_SET)) {
 	    drivep->cylinders = ((BD_CX >> 8) & 255);
 	    drivep->cylinders += (((BD_CX >> 6) & 3) * 256);
-	    drivep->heads = ((BD_DX >> 8) & 63) + 1;
+	    drivep->heads = ((BD_DX >> 8)) + 1;
 	    drivep->sectors = (BD_CX & 63);
 	    drivep->fdtype = -1;
 	}

@@ -461,8 +461,9 @@
 	BD_DX = hd_drive_map[target];	/* Head 0, drive number */
 	call_bios();
 	if (!CARRY_SET) {
-	    drivep->sectors = (BD_CX & 0xff) + 1;
-	    drivep->cylinders = (BD_CX >> 8) + 1;
+	    drivep->sectors = (BD_CX & 0x3f)/* + 1*/;
+	    drivep->cylinders = ((BD_CX >> 8) | ((BD_CX & 0xC0) << 2)) + 1;
+	    drivep->heads = (BD_DX >> 8)  + 1;
 	} else
 	    printk("bioshd_open: no diskinfo %d\n", hd_drive_map[target]);
 

@@ -700,7 +701,7 @@
 
 	start = req->rq_sector;
 	buff = req->rq_buffer;
-	if ((int) hd[minor].start_sect == -1 || start >= hd[minor].nr_sects) {
+	if ((int) hd[minor].start_sect == -1 /*|| start >= hd[minor].nr_sects*/) {
 	    printk("hd: bad partition start=%d sect=%d nr_sects=%d.\n",
 		   start, (int) hd[minor].start_sect,
 		   (int) hd[minor].nr_sects);

diff -Naurw elks/arch/i86/drivers/char/KeyMaps/keymaps.h ../nanox-read-only/arch/i86/drivers/char/KeyMaps/keymaps.h
@@ -1,11 +0,0 @@
-/* Automatically created - do not edit */
-
-#include "keys-be.h"		/* BE	Belgique 	*/
-#include "keys-de.h"		/* DE	Deutsch  	*/
-#include "keys-dv.h"		/* DV	Dvorak   	*/
-#include "keys-es.h"		/* ES	Espanol  	*/
-#include "keys-be.h"		/* FR	Fran���ais 	*/
-#include "keys-it.h"		/* IT	Italiano 	*/
-#include "keys-se.h"		/* SE	Suede    	*/
-#include "keys-uk.h"		/* UK	British  	*/
-#include "keys-us.h"		/* US	American 	*/

diff -Naurw elks/arch/i86/drivers/char/bioscon.c ../nanox-read-only/arch/i86/drivers/char/bioscon.c
@@ -15,6 +15,7 @@
 #include <linuxmt/major.h>
 #include <linuxmt/sched.h>
 #include <linuxmt/ntty.h>
+#include <linuxmt/debug.h>
 
 #ifdef CONFIG_CONSOLE_BIOS 
 

diff -Naurw elks/arch/i86/drivers/char/meta.c ../nanox-read-only/arch/i86/drivers/char/meta.c
@@ -67,11 +67,11 @@
 
 static void do_meta_request(kdev_t device)
 {
-    int major = MAJOR(device);
     struct ud_driver *driver = get_driver(major);
     struct ud_request *udr;
     struct request *req;
     char *buff;
+    int major = MAJOR(device);
 
     printk("do_meta_request %d %x\n", major, blk_dev[major].current_request);
     if (NULL == driver) {

330 lines not on this page · raw message

100 lines not on this page · raw message

diff -Naurw elks/arch/i86/tools/wrt_disk.c ../nanox-read-only/arch/i86/tools/wrt_disk.c
@@ -7,7 +7,7 @@
  * pick up any improvements as that developes.
  */
 
-#define DEBUG
+#define DEBUG_WRT_DISK
 
 #include "tools.h"
 

@@ -51,7 +51,7 @@
     LCD_WriteChar(' ');
 }
 
-#ifndef DEBUG
+#ifndef DEBUG_WRT_DISK
 
 void debug(char *a) {
     while (*a)

@@ -314,3 +314,5 @@
 
     return 0;
 }
+
+#undef DEBUG_WRT_DISK

diff -Naurw elks/fs/romfs/inode.c ../nanox-read-only/fs/romfs/inode.c
@@ -243,7 +243,7 @@
     return res;
 }
 
-static int romfs_copyfrom(struct inode *i, char *dest, loff_t offset,
+static int romfs_copyfrom(struct inode *i, void *dest, loff_t offset,
 			  size_t count)
 {
     struct buffer_head *bh;

@@ -279,7 +279,7 @@
 
     while (res < count) {
 	offset += maxsize;
-	*dest += maxsize;
+	((char *) dest) += maxsize;
 
 	bh = bread(i->i_dev, (block_t) (offset >> ROMBSBITS));
 

diff -Naurw elks/include/arch/debug_disp.h ../nanox-read-only/include/arch/debug_disp.h
@@ -7,7 +7,10 @@
  *      Debugging facility over i/o port 
  * Modifications:
  * 
- * $Log$
+ * $Log: debug_disp.h,v $
+ * Revision 1.3  2002/04/26 19:45:17  rhw2
+ * Next stage of `make lint` verification of the ELKS source code.
+ *
  * Revision 1.2  2002/02/24 17:29:00  rhw2
  * Fixed #else and #endif to not fox the bcc -ansi option. Reformatted scripts/Configure and scripts/Menuconfig to a consistent style. Removed ELKS dependency on the Linux kernel source being available.
  *

diff -Naurw elks/include/arch/dma.h ../nanox-read-only/include/arch/dma.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dma.h,v 1.5 2002/04/26 19:45:18 rhw2 Exp $
  * linux/include/asm/dma.h: Defines for using and allocating dma channels.
  * Written by Hennus Bergman, 1992.
  * High DMA channel support & info by Hannu Savolainen

diff -Naurw elks/init/main.c ../nanox-read-only/init/main.c
@@ -1,4 +1,4 @@
-/* $Header$ 
+/* $Header: /cvsroot/elks/elks/init/main.c,v 1.28 2006/11/08 22:57:21 segin Exp $ 
  */
 
 #include <linuxmt/config.h>

153 lines not on this page · raw message