summaryrefslogtreecommitdiff
path: root/i386/i386at/gpl/linux
diff options
context:
space:
mode:
Diffstat (limited to 'i386/i386at/gpl/linux')
-rw-r--r--i386/i386at/gpl/linux/block/genhd.c20
-rw-r--r--i386/i386at/gpl/linux/block/triton.c8
-rw-r--r--i386/i386at/gpl/linux/include/linux/autoconf.h19
-rw-r--r--i386/i386at/gpl/linux/linux_block.c10
-rw-r--r--i386/i386at/gpl/linux/linux_init.c12
-rw-r--r--i386/i386at/gpl/linux/net/8390.c2
-rw-r--r--i386/i386at/gpl/linux/pci/bios32.c6
-rw-r--r--i386/i386at/gpl/linux/pci/pci.c2
-rw-r--r--i386/i386at/gpl/linux/scsi/aha1740.c7
-rw-r--r--i386/i386at/gpl/linux/scsi/hosts.c8
-rw-r--r--i386/i386at/gpl/linux/scsi/scsi.c4
11 files changed, 69 insertions, 29 deletions
diff --git a/i386/i386at/gpl/linux/block/genhd.c b/i386/i386at/gpl/linux/block/genhd.c
index 60cba6c..cebc7ea 100644
--- a/i386/i386at/gpl/linux/block/genhd.c
+++ b/i386/i386at/gpl/linux/block/genhd.c
@@ -88,7 +88,7 @@ static void add_partition (struct gendisk *hd, int minor, int start, int size)
{
hd->part[minor].start_sect = start;
hd->part[minor].nr_sects = size;
- print_minor_name(hd, minor);
+ /* print_minor_name(hd, minor);*/
}
static inline int is_extended_partition(struct partition *p)
@@ -301,7 +301,7 @@ check_table:
continue;
add_partition(hd, minor, first_sector+START_SECT(p), NR_SECTS(p));
if (is_extended_partition(p)) {
- printk(" <");
+ /* printk(" <");*/
/*
* If we are rereading the partition table, we need
* to set the size of the partition so that we will
@@ -311,7 +311,7 @@ check_table:
hd->sizes[minor] = hd->part[minor].nr_sects
>> (BLOCK_SIZE_BITS - 9);
extended_partition(hd, MKDEV(hd->major, minor));
- printk(" >");
+ /* printk(" >");*/
/* prevent someone doing mkfs or mkswap on an
extended partition, but leave room for LILO */
if (hd->part[minor].nr_sects > 2)
@@ -332,7 +332,7 @@ check_table:
add_partition(hd, current_minor, START_SECT(p), NR_SECTS(p));
}
}
- printk("\n");
+ /* printk("\n");*/
brelse(bh);
return 1;
}
@@ -405,7 +405,7 @@ static int osf_partition(struct gendisk *hd, unsigned int dev, unsigned long fir
partition->p_size);
current_minor++;
}
- printk("\n");
+ /* printk("\n");*/
brelse(bh);
return 1;
}
@@ -475,7 +475,7 @@ static int sun_partition(struct gendisk *hd, unsigned int dev, unsigned long fir
add_partition(hd, current_minor, st_sector, p->num_sectors);
current_minor++;
}
- printk("\n");
+ /* printk("\n");*/
brelse(bh);
return 1;
}
@@ -487,8 +487,8 @@ static void check_partition(struct gendisk *hd, kdev_t dev)
static int first_time = 1;
unsigned long first_sector;
- if (first_time)
- printk("Partition check:\n");
+ /* if (first_time)
+ printk("Partition check:\n");*/
first_time = 0;
first_sector = hd->part[MINOR(dev)].start_sect;
@@ -501,8 +501,8 @@ static void check_partition(struct gendisk *hd, kdev_t dev)
return;
}
- printk(" ");
- print_minor_name(hd, MINOR(dev));
+ /* printk(" ");
+ print_minor_name(hd, MINOR(dev));*/
#ifdef CONFIG_MSDOS_PARTITION
if (msdos_partition(hd, dev, first_sector))
return;
diff --git a/i386/i386at/gpl/linux/block/triton.c b/i386/i386at/gpl/linux/block/triton.c
index 5829661..4f825f6 100644
--- a/i386/i386at/gpl/linux/block/triton.c
+++ b/i386/i386at/gpl/linux/block/triton.c
@@ -341,9 +341,13 @@ static void init_triton_dma (ide_hwif_t *hwif, unsigned short base)
{
static unsigned long dmatable = 0;
+#if 0
printk(" %s: BusMaster DMA at 0x%04x-0x%04x", hwif->name, base, base+7);
+#endif
if (check_region(base, 8)) {
+#if 0
printk(" -- ERROR, PORTS ALREADY IN USE");
+#endif
} else {
request_region(base, 8, "triton DMA");
hwif->dma_base = base;
@@ -362,7 +366,9 @@ static void init_triton_dma (ide_hwif_t *hwif, unsigned short base)
hwif->dmaproc = &triton_dmaproc;
}
}
+#if 0
printk("\n");
+#endif
}
/*
@@ -448,10 +454,12 @@ void ide_init_triton (byte bus, byte fn)
continue;
s_clks = ((~time >> 12) & 3) + 2;
r_clks = ((~time >> 8) & 3) + 1;
+#if 0
printk(" %s timing: (0x%04x) sample_CLKs=%d, recovery_CLKs=%d (PIO mode%d)\n",
hwif->name, time, s_clks, r_clks, calc_mode(s_clks+r_clks));
print_triton_drive_flags (0, time & 0xf);
print_triton_drive_flags (1, (time >> 4) & 0xf);
+#endif
}
quit: if (rc) printk("ide: pcibios access failed - %s\n", pcibios_strerror(rc));
diff --git a/i386/i386at/gpl/linux/include/linux/autoconf.h b/i386/i386at/gpl/linux/include/linux/autoconf.h
index 1588347..0d565ae 100644
--- a/i386/i386at/gpl/linux/include/linux/autoconf.h
+++ b/i386/i386at/gpl/linux/include/linux/autoconf.h
@@ -1,8 +1,4 @@
/*
- * Automatically generated C config: don't edit
- */
-
-/*
* Loadable module support
*/
#undef CONFIG_MODULES
@@ -25,11 +21,16 @@
#undef CONFIG_M586
#undef CONFIG_M686
+/* Fetch GNUmach driver config file */
+#include <i386/device-drivers.h>
+
+#if 0 /* these are now in device-drivers.h */
/*
* Floppy, IDE, and other block devices
*/
#define CONFIG_BLK_DEV_FD 1
#define CONFIG_BLK_DEV_IDE 1
+#endif
/*
* Please see drivers/block/README.ide for help/info on IDE drives
@@ -46,6 +47,7 @@
#undef CONFIG_BLK_DEV_LOOP
#undef CONFIG_BLK_DEV_XD
+#if 0 /* now in device-drivers.h */
/*
* Networking options
*/
@@ -55,6 +57,7 @@
#undef CONFIG_IP_FORWARD
#undef CONFIG_IP_MULTICAST
#undef CONFIG_IP_ACCT
+#endif
/*
* (it is safe to leave these untouched)
@@ -74,10 +77,12 @@
#undef CONFIG_AX25
#undef CONFIG_NETLINK
+#if 0
/*
* SCSI support
*/
#define CONFIG_SCSI 1
+#endif
/*
* SCSI support type (disk, tape, CDrom)
@@ -87,6 +92,7 @@
#define CONFIG_BLK_DEV_SR 1
#undef CONFIG_CHR_DEV_SG
+#if 0 /* now in device-drivers.h */
/*
* Some SCSI devices (e.g. CD jukebox) support multiple LUNs
*/
@@ -118,6 +124,7 @@
#undef CONFIG_SCSI_NCR53C406A
#undef CONFIG_SCSI_AM53C974
#define CONFIG_SCSI_NCR53C7xx 1
+#endif
/*
* Network device support
@@ -129,6 +136,7 @@
#undef CONFIG_SLIP_SMART
#undef CONFIG_PPP
+#if 0
/*
* CCP compressors for PPP are only built as modules.
*/
@@ -164,6 +172,7 @@
* CD-ROM drivers (not for SCSI or IDE/ATAPI drives)
*/
#undef CONFIG_CD_NO_IDESCSI
+#endif
/*
* Filesystems
@@ -185,6 +194,7 @@
#undef CONFIG_HPFS_FS
#undef CONFIG_SYSV_FS
+#if 0
/*
* Character devices
*/
@@ -208,3 +218,4 @@
* Kernel hacking
*/
#undef CONFIG_PROFILE
+#endif
diff --git a/i386/i386at/gpl/linux/linux_block.c b/i386/i386at/gpl/linux/linux_block.c
index e06cc40..d7e335b 100644
--- a/i386/i386at/gpl/linux/linux_block.c
+++ b/i386/i386at/gpl/linux/linux_block.c
@@ -1600,7 +1600,7 @@ check_disk_change (kdev_t dev)
if (! (*fops->check_media_change) (dev))
return 0;
- printf ("Disk change detected on device %s\n", kdevname(dev));
+ /* printf ("Disk change detected on device %s\n", kdevname(dev));*/
if (fops->revalidate)
(*fops->revalidate) (dev);
@@ -1918,8 +1918,8 @@ find_major:
goto slice_done;
}
- printf ("%s: default slice %d: %s OS\n", np->name, slice,
- (sysid == UNIXOS ? "Mach" : (sysid == BSDOS ? "BSD" : "LINUX")));
+ /* printf ("%s: default slice %d: %s OS\n", np->name, slice,
+ (sysid == UNIXOS ? "Mach" : (sysid == BSDOS ? "BSD" : "LINUX")));*/
slice_done:
if (ds->fops->release)
@@ -2049,7 +2049,7 @@ find_major:
dlp = (struct disklabel *) (bhp->b_data + ((LBLLOC << 9) & (bsize - 1)));
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC)
goto vtoc;
- printf ("%s: BSD LABEL\n", np->name);
+ /* printf ("%s: BSD LABEL\n", np->name);*/
lp->d_npartitions = dlp->d_npartitions;
memcpy (lp->d_partitions, dlp->d_partitions,
MAXPARTITIONS * sizeof (struct partition));
@@ -2080,7 +2080,7 @@ find_major:
err = D_NO_SUCH_DEVICE;
goto label_done;
}
- printf ("%s: LOCAL LABEL\n", np->name);
+ /* printf ("%s: LOCAL LABEL\n", np->name);*/
lp->d_npartitions = (evp->nparts > MAXPARTITIONS
? MAXPARTITIONS : evp->nparts);
for (i = 0; i < lp->d_npartitions; i++)
diff --git a/i386/i386at/gpl/linux/linux_init.c b/i386/i386at/gpl/linux/linux_init.c
index d2abae2..4e7b006 100644
--- a/i386/i386at/gpl/linux/linux_init.c
+++ b/i386/i386at/gpl/linux/linux_init.c
@@ -54,6 +54,8 @@
#include <asm/system.h>
+#include <i386/device-drivers.h>
+
/*
* Set if the machine has an EISA bus.
*/
@@ -230,7 +232,9 @@ linux_init()
/*
* Initialize devices.
*/
+#ifdef CONFIG_INET
linux_net_emulation_init();
+#endif
cli();
device_setup();
@@ -389,7 +393,7 @@ calibrate_delay()
{
int ticks;
- printk("Calibrating delay loop.. ");
+ /* printk("Calibrating delay loop.. "); */
while (loops_per_sec <<= 1) {
/* Wait for "start of" clock tick. */
ticks = jiffies;
@@ -402,11 +406,11 @@ calibrate_delay()
if (ticks >= hz) {
loops_per_sec = muldiv(loops_per_sec,
hz, ticks);
- printk("ok - %lu.%02lu BogoMips\n",
+ /*printk("ok - %lu.%02lu BogoMips\n",
loops_per_sec / 500000,
- (loops_per_sec / 5000) % 100);
+ (loops_per_sec / 5000) % 100);*/
return;
}
}
- printk("failed\n");
+/* printk("failed\n");*/
}
diff --git a/i386/i386at/gpl/linux/net/8390.c b/i386/i386at/gpl/linux/net/8390.c
index 05ea32f..7962413 100644
--- a/i386/i386at/gpl/linux/net/8390.c
+++ b/i386/i386at/gpl/linux/net/8390.c
@@ -85,7 +85,7 @@ static const char *version =
#ifdef EI_DEBUG
int ei_debug = EI_DEBUG;
#else
-int ei_debug = 1;
+int ei_debug = 0;
#endif
#ifdef EI_PINGPONG
static int ei_pingpong = 1;
diff --git a/i386/i386at/gpl/linux/pci/bios32.c b/i386/i386at/gpl/linux/pci/bios32.c
index e10fdab..f0717fd 100644
--- a/i386/i386at/gpl/linux/pci/bios32.c
+++ b/i386/i386at/gpl/linux/pci/bios32.c
@@ -192,10 +192,12 @@ extern unsigned long check_pcibios(unsigned long memory_start, unsigned long mem
if (signature != PCI_SIGNATURE)
pcibios_entry = 0;
}
+#if 0
if (pcibios_entry) {
printk ("pcibios_init : PCI BIOS revision %x.%02x entry at 0x%lx\n",
major_revision, minor_revision, pcibios_entry);
}
+#endif
}
return memory_start;
}
@@ -433,13 +435,17 @@ unsigned long pcibios_init(unsigned long memory_start, unsigned long memory_end)
check->fields.revision, check);
continue;
}
+#if 0
printk ("pcibios_init : BIOS32 Service Directory structure at 0x%p\n", check);
+#endif
if (!bios32_entry) {
if (check->fields.entry >= 0x100000) {
printk("pcibios_init: entry in high memory, unable to access\n");
} else {
bios32_indirect.address = bios32_entry = check->fields.entry;
+#if 0
printk ("pcibios_init : BIOS32 Service Directory entry at 0x%lx\n", bios32_entry);
+#endif
}
} else {
printk ("pcibios_init : multiple entries, mail drew@colorado.edu\n");
diff --git a/i386/i386at/gpl/linux/pci/pci.c b/i386/i386at/gpl/linux/pci/pci.c
index 03846d0..e5f5979 100644
--- a/i386/i386at/gpl/linux/pci/pci.c
+++ b/i386/i386at/gpl/linux/pci/pci.c
@@ -894,7 +894,9 @@ unsigned long pci_init (unsigned long mem_start, unsigned long mem_end)
return mem_start;
}
+#if 0
printk("Probing PCI hardware.\n");
+#endif
memset(&pci_root, 0, sizeof(pci_root));
pci_root.subordinate = scan_bus(&pci_root, &mem_start);
diff --git a/i386/i386at/gpl/linux/scsi/aha1740.c b/i386/i386at/gpl/linux/scsi/aha1740.c
index e3b8f1d..250aa1b 100644
--- a/i386/i386at/gpl/linux/scsi/aha1740.c
+++ b/i386/i386at/gpl/linux/scsi/aha1740.c
@@ -1,4 +1,4 @@
-/* $Id: aha1740.c,v 1.1.1.1 1997/02/25 21:27:46 thomas Exp $
+/* $Id: aha1740.c,v 1.2 1997/03/24 21:51:17 thomas Exp $
* 1993/03/31
* linux/kernel/aha1740.c
*
@@ -56,7 +56,7 @@ struct proc_dir_entry proc_scsi_aha1740 = {
#endif
/*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/aha1740.c,v 1.1.1.1 1997/02/25 21:27:46 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/aha1740.c,v 1.2 1997/03/24 21:51:17 thomas Exp $";
*/
static unsigned int slot, base;
@@ -166,6 +166,9 @@ int aha1740_test_port(void)
return 0;
}
+ /* Try and turn on enhanced mode */
+ tmp = inb (PORTADR);
+ outb (PORTADR, tmp | PORTADDR_ENH);
if ( inb(PORTADR) & PORTADDR_ENH )
return 1; /* Okay, we're all set */
diff --git a/i386/i386at/gpl/linux/scsi/hosts.c b/i386/i386at/gpl/linux/scsi/hosts.c
index cb0163b..72ae0cb 100644
--- a/i386/i386at/gpl/linux/scsi/hosts.c
+++ b/i386/i386at/gpl/linux/scsi/hosts.c
@@ -134,7 +134,7 @@
#endif
/*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/hosts.c,v 1.1.1.1 1997/02/25 21:27:49 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/hosts.c,v 1.2 1997/03/24 21:51:24 thomas Exp $";
*/
/*
@@ -387,12 +387,16 @@ unsigned int scsi_init()
name = shpnt->hostt->info(shpnt);
else
name = shpnt->hostt->name;
+#if 0
printk ("scsi%d : %s\n", /* And print a little message */
shpnt->host_no, name);
+#endif
}
-
+
+#if 0
printk ("scsi : %d host%s.\n", next_scsi_host,
(next_scsi_host == 1) ? "" : "s");
+#endif
scsi_make_blocked_list();
diff --git a/i386/i386at/gpl/linux/scsi/scsi.c b/i386/i386at/gpl/linux/scsi/scsi.c
index 85d234e..7b29168 100644
--- a/i386/i386at/gpl/linux/scsi/scsi.c
+++ b/i386/i386at/gpl/linux/scsi/scsi.c
@@ -49,7 +49,7 @@
#undef USE_STATIC_SCSI_MEMORY
/*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/scsi.c,v 1.1.1.1 1997/02/25 21:27:50 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/scsi.c,v 1.2 1997/03/24 21:51:33 thomas Exp $";
*/
@@ -2352,12 +2352,14 @@ int scsi_dev_init(void)
for (shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next)
scan_scsis(shpnt,0,0,0,0); /* scan for scsi devices */
+#if 0
printk("scsi : detected ");
for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next)
if (sdtpnt->dev_noticed && sdtpnt->name)
printk("%d SCSI %s%s ", sdtpnt->dev_noticed, sdtpnt->name,
(sdtpnt->dev_noticed != 1) ? "s" : "");
printk("total.\n");
+#endif
for(sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next)
if(sdtpnt->init && sdtpnt->dev_noticed) (*sdtpnt->init)();
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 23:47:00 +0000