[parisc-linux-cvs] 2.4.18-pa9 (harmony, STI w/o PCI)
Helge Deller
deller@gmx.de
Mon, 25 Mar 2002 23:12:49 +0100
--------------Boundary-00=_D1VJS4OH0JNVDQMA55W0
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
On Monday 25 March 2002 23:11, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux
> Changes by: deller 02/03/25 15:11:40
>
> Modified files:
> . : Makefile
> drivers/gsc : eisa.c
> drivers/sound : harmony.c
> drivers/video/sti: sticore.c
>
> Log message:
> 2.4.18-pa9:
> - harmony on 735/99 patch (for Pace, Outfield, Coral II)
> Patch by Matthew Wilcox:
> http://lists.parisc-linux.org/pipermail/parisc-linux/2002-March/015905.html
> - STI without PCI patch by Matthew Wilcox:
> http://lists.parisc-linux.org/pipermail/parisc-linux/2002-March/015849.html
> - minimal documentation changes in eisa.c
--------------Boundary-00=_D1VJS4OH0JNVDQMA55W0
Content-Type: text/plain;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline; filename="diff"
Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.279
diff -u -p -r1.279 Makefile
--- Makefile 2002/03/23 22:47:42 1.279
+++ Makefile 2002/03/25 21:54:54
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 18
-EXTRAVERSION = -pa8
+EXTRAVERSION = -pa9
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: drivers/gsc/eisa.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/eisa.c,v
retrieving revision 1.17
diff -u -p -r1.17 eisa.c
--- drivers/gsc/eisa.c 2002/02/28 07:15:36 1.17
+++ drivers/gsc/eisa.c 2002/03/25 21:55:03
@@ -120,12 +120,12 @@ static int master_mask;
static int slave_mask;
/* the trig level can be set with the
- * eisa_irq_edge=n,n,n commanlnine parameter
+ * eisa_irq_edge=n,n,n commandline parameter
* We should really read this from the EEPROM
* in the furure.
*/
/* irq 13,8,2,1,0 must be edge */
-static unsigned int eisa_irq_level=0; /* default to edge triggered */
+static unsigned int eisa_irq_level; /* default to edge triggered */
/* called by free irq */
@@ -203,7 +203,7 @@ static void eisa_unmask_irq(void *irq_de
static struct irqaction action[IRQ_PER_REGION];
-/* EISA needs to be fixed at IRQ region #0 (EISA_IRQ_REGION) */
+/* EISA needs to be fixed at IRQ region #0 (EISA_IRQ_REGION) */
static struct irq_region eisa_irq_region = {
ops: { eisa_disable_irq, eisa_enable_irq, eisa_mask_irq, eisa_unmask_irq },
data: { name: "EISA", irqbase: 0 },
Index: drivers/sound/harmony.c
===================================================================
RCS file: /var/cvs/linux/drivers/sound/harmony.c,v
retrieving revision 1.25
diff -u -p -r1.25 harmony.c
--- drivers/sound/harmony.c 2002/02/14 19:02:21 1.25
+++ drivers/sound/harmony.c 2002/03/25 21:55:13
@@ -955,7 +955,8 @@ static int harmony_mixer_get_recmask(voi
{
int current_input_line;
- current_input_line = (harmony.current_gain & GAIN_IS_MASK) >> GAIN_IS_SHIFT;
+ current_input_line = (harmony.current_gain & GAIN_IS_MASK)
+ >> GAIN_IS_SHIFT;
if (current_input_line)
return SOUND_MASK_MIC;
@@ -978,7 +979,8 @@ static int harmony_mixer_set_recmask(int
new_input_line = 1;
new_input_mask = SOUND_MASK_MIC;
}
- harmony.current_gain = ((harmony.current_gain & ~GAIN_IS_MASK) | (new_input_line << GAIN_IS_SHIFT ));
+ harmony.current_gain = ((harmony.current_gain & ~GAIN_IS_MASK) |
+ (new_input_line << GAIN_IS_SHIFT ));
harmony_mixer_set_gain();
return new_input_mask;
}
@@ -1026,7 +1028,8 @@ static int harmony_mixer_set_outmask(int
* This code is inspired from sb_mixer.c
*/
-static int harmony_mixer_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg)
+static int harmony_mixer_ioctl(struct inode * inode, struct file * file,
+ unsigned int cmd, unsigned long arg)
{
int val;
int ret;
@@ -1244,8 +1247,11 @@ out_err:
static struct parisc_device_id harmony_tbl[] = {
- { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0007B },
- { 0, }
+ /* { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0007A }, Bushmaster/Flounder */
+ { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0007B }, /* 712/715 Audio */
+ { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0007E }, /* Pace Audio */
+ { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0007F }, /* Outfield / Coral II */
+ { 0, }
};
MODULE_DEVICE_TABLE(parisc, harmony_tbl);
Index: drivers/video/sti/sticore.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/sticore.c,v
retrieving revision 1.37
diff -u -p -r1.37 sticore.c
--- drivers/video/sti/sticore.c 2002/03/03 23:05:06 1.37
+++ drivers/video/sti/sticore.c 2002/03/25 21:55:16
@@ -3,8 +3,8 @@
* core code for console driver using HP's STI firmware
*
* Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
- * Portions Copyright (C) 2001 Helge Deller <deller@gmx.de>
- * Portions Copyright (C) 2001 Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+ * Portions Copyright (C) 2001-2002 Helge Deller <deller@gmx.de>
+ * Portions Copyright (C) 2001-2002 Thomas Bogendoerfer <tsbogend@alpha.franken.de>
*
* TODO:
* - call STI in virtual mode rather than in real mode
@@ -14,6 +14,7 @@
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@ -922,6 +923,7 @@ static int __init sticore_pa_init(struct
static int __devinit sticore_pci_init(struct pci_dev *pd,
const struct pci_device_id *ent)
{
+#ifdef CONFIG_PCI
unsigned long fb_base, rom_base;
unsigned int fb_len, rom_len;
struct sti_struct *sti;
@@ -962,6 +964,7 @@ static int __devinit sticore_pci_init(st
pd->name);
return -ENODEV;
}
+#endif /* CONFIG_PCI */
return 0;
}
--------------Boundary-00=_D1VJS4OH0JNVDQMA55W0--