[parisc-linux-cvs] -pa5 cleanups
Helge Deller
deller@gmx.de
Fri, 24 Aug 2001 16:50:58 +0200
On Friday 24 August 2001 16:45, Helge Deller wrote:
> CVSROOT: /home/cvs/parisc
> Module name: linux
> Changes by: deller 01/08/24 08:45:07
>
> Modified files:
> . : Makefile
> arch/parisc : defconfig
> arch/parisc/kernel: drivers.c lba_pci.c pci.c
> arch/parisc/lib: io.c
> drivers/video : fbcon-sti.c
> drivers/video/sti: sticon.c
>
> Log message:
> - EXTRAVERSION -pa5
> - updated defconfig file
> - cleanups in drivers.c, lba_pci.c, pci.c
> - pci.c: fix crash on 715/XX machines without PCI
> - compiler warning fix in io.c
> - applied Geert Uytterhoeven's <geert@linux-m68k.org> patches to
> fbcon-sti.c & sticon.c
Index: linux/Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.116
diff -u -r1.116 Makefile
--- Makefile 2001/08/22 13:23:46 1.116
+++ Makefile 2001/08/24 14:33:35
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 9
-EXTRAVERSION = -pa4
+EXTRAVERSION = -pa5
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: linux/arch/parisc/defconfig
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/defconfig,v
retrieving revision 1.40
diff -u -r1.40 defconfig
--- defconfig 2001/07/09 02:00:15 1.40
+++ defconfig 2001/08/24 14:33:38
@@ -23,6 +23,7 @@
# CONFIG_PA7200 is not set
# CONFIG_PA7100LC is not set
# CONFIG_PA8X00 is not set
+# CONFIG_PA11 is not set
#
# General options
@@ -62,6 +63,8 @@
#
CONFIG_PARPORT=y
CONFIG_PARPORT_PC=y
+CONFIG_PARPORT_PC_CML1=y
+# CONFIG_PARPORT_SERIAL is not set
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
# CONFIG_PARPORT_PC_PCMCIA is not set
@@ -144,6 +147,13 @@
# CONFIG_NET_SCHED is not set
#
+# ATA/IDE/MFM/RLL support
+#
+# CONFIG_IDE is not set
+# CONFIG_BLK_DEV_IDE_MODES is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
# SCSI support
#
CONFIG_SCSI=y
@@ -297,6 +307,7 @@
#
# CONFIG_ACENIC is not set
# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_DL2K is not set
# CONFIG_MYRI_SBUS is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
@@ -388,6 +399,7 @@
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
#
# Ftape, the floppy tape device driver
@@ -536,6 +548,8 @@
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_STI=y
+# CONFIG_FB_PVR2 is not set
+# CONFIG_FB_PVR2_DEBUG is not set
# CONFIG_FB_E1355 is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_ATY is not set
@@ -566,9 +580,10 @@
# Sound
#
CONFIG_SOUND=y
-CONFIG_SOUND_HARMONY=y
+# CONFIG_SOUND_BT878 is not set
# CONFIG_SOUND_CMPCI is not set
# CONFIG_SOUND_EMU10K1 is not set
+# CONFIG_MIDI_EMU10K1 is not set
# CONFIG_SOUND_FUSION is not set
# CONFIG_SOUND_CS4281 is not set
# CONFIG_SOUND_ES1370 is not set
@@ -577,6 +592,8 @@
# CONFIG_SOUND_MAESTRO is not set
# CONFIG_SOUND_MAESTRO3 is not set
# CONFIG_SOUND_ICH is not set
+CONFIG_SOUND_HARMONY=y
+# CONFIG_SOUND_RME96XX is not set
# CONFIG_SOUND_SONICVIBES is not set
# CONFIG_SOUND_TRIDENT is not set
# CONFIG_SOUND_MSNDCLAS is not set
@@ -585,6 +602,11 @@
# CONFIG_MIDI_VIA82CXXX is not set
# CONFIG_SOUND_OSS is not set
# CONFIG_SOUND_TVMIXER is not set
+
+#
+# USB support
+#
+# CONFIG_USB is not set
#
# Kernel hacking
Index: linux/arch/parisc/kernel/drivers.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/drivers.c,v
retrieving revision 1.19
diff -u -r1.19 drivers.c
--- drivers.c 2001/08/14 16:54:52 1.19
+++ drivers.c 2001/08/24 14:33:39
@@ -28,7 +28,7 @@
static int num_devices;
static struct parisc_device pa_devices[MAX_DEVICES];
-static struct parisc_driver *pa_drivers = NULL;
+static struct parisc_driver *pa_drivers;
/**
* match_device - Report whether this driver can handle this device
@@ -69,7 +69,8 @@
if (driver->next) {
BUG();
- printk(KERN_WARNING "BUG: Skipping previously registered driver: %s %s\n", driver->name, driver->version);
+ printk(KERN_WARNING "BUG: Skipping previously registered driver: %s %s\n",
+ driver->name, driver->version);
return 1;
}
Index: linux/arch/parisc/kernel/lba_pci.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/lba_pci.c,v
retrieving revision 1.32
diff -u -r1.32 lba_pci.c
--- lba_pci.c 2001/08/16 20:57:18 1.32
+++ lba_pci.c 2001/08/24 14:33:41
@@ -631,9 +631,12 @@
LBA_CFG_WR(32, 0)
static struct pci_ops lba_cfg_ops = {
- lba_cfg_read8, lba_cfg_read16, lba_cfg_read32,
- lba_cfg_write8, lba_cfg_write16, lba_cfg_write32
-
+ read_byte: lba_cfg_read8,
+ read_word: lba_cfg_read16,
+ read_dword: lba_cfg_read32,
+ write_byte: lba_cfg_write8,
+ write_word: lba_cfg_write16,
+ write_dword: lba_cfg_write32
};
@@ -861,8 +864,8 @@
struct pci_bios_ops lba_bios_ops = {
- lba_bios_init,
- lba_fixup_bus /* void lba_fixup_bus(struct pci_bus *bus) */
+ init: lba_bios_init,
+ fixup_bus: lba_fixup_bus,
};
Index: linux/arch/parisc/kernel/pci.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/pci.c,v
retrieving revision 1.24
diff -u -r1.24 pci.c
--- pci.c 2001/08/23 18:28:48 1.24
+++ pci.c 2001/08/24 14:33:42
@@ -49,8 +49,8 @@
struct pci_port_ops *pci_port;
struct pci_bios_ops *pci_bios;
-struct pci_hba_data *hba_list = NULL;
-int hba_count = 0;
+struct pci_hba_data *hba_list;
+static int hba_count;
/*
** parisc_pci_hba used by pci_port->in/out() ops to lookup bus data.
@@ -111,6 +111,9 @@
void pcibios_init(void)
{
ASSERT(pci_bios != NULL);
+
+ if (!pci_bios)
+ return;
if (pci_bios->init) {
pci_bios->init();
Index: linux/arch/parisc/lib/io.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/lib/io.c,v
retrieving revision 1.4
diff -u -r1.4 io.c
--- io.c 2001/07/15 20:02:05 1.4
+++ io.c 2001/08/24 14:33:42
@@ -7,6 +7,7 @@
* IO accessing functions which shouldn't be inlined because they're too big
*/
+#include <linux/kernel.h>
#include <asm/io.h>
/* Copies a block of memory to a device in an efficient manner.
Index: linux/drivers/video/fbcon-sti.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/fbcon-sti.c,v
retrieving revision 1.6
diff -u -r1.6 fbcon-sti.c
--- fbcon-sti.c 2001/08/17 06:11:31 1.6
+++ fbcon-sti.c 2001/08/24 14:33:59
@@ -261,9 +261,10 @@
return;
}
- bold = attr_bold(p,scr_readw(s));
- revs = attr_reverse(p,scr_readw(s));
- underl = attr_underline(p,scr_readw(s));
+ c = scr_readw(s);
+ bold = attr_bold(p,c);
+ revs = attr_reverse(p,c);
+ underl = attr_underline(p,c);
while (count--) {
c = scr_readw(s++) & p->charmask;
Index: linux/drivers/video/sti/sticon.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/sti/sticon.c,v
retrieving revision 1.19
diff -u -r1.19 sticon.c
--- sticon.c 2001/07/10 16:50:51 1.19
+++ sticon.c 2001/08/24 14:33:59
@@ -136,7 +136,7 @@
#endif
while (count--) {
- sti_putc(default_sti, *s++, ypos, xpos++);
+ sti_putc(default_sti, scr_readw(s++), ypos, xpos++);
}
if (redraw_cursor)