Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/arch/m68k/amiga amisound.c,1.1.1.1,1.2 cia.c,1.1.1.1,1.2 config.c,1.1.1.1,1.2 pcmcia.c,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-10 18:32:26
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/m68k/amiga
In directory usw-pr-cvs1:/tmp/cvs-serv13561/m68k/amiga
Modified Files:
amisound.c cia.c config.c pcmcia.c
Log Message:
synch 2.4.15 commit 37
Index: amisound.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/amiga/amisound.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- amisound.c 14 Jan 2001 19:34:08 -0000 1.1.1.1
+++ amisound.c 10 Apr 2002 14:34:33 -0000 1.2
@@ -16,7 +16,7 @@
#include <asm/system.h>
#include <asm/amigahw.h>
-static u_short *snd_data = NULL;
+static unsigned short *snd_data = NULL;
static const signed char sine_data[] = {
0, 39, 75, 103, 121, 127, 121, 103, 75, 39,
0, -39, -75, -103, -121, -127, -121, -103, -75, -39
@@ -28,7 +28,7 @@
* device since it depends on htotal (for OCS/ECS/AGA)
*/
-volatile u_short amiga_audio_min_period = 124; /* Default for pre-OCS */
+volatile unsigned short amiga_audio_min_period = 124; /* Default for pre-OCS */
#define MAX_PERIOD (65535)
@@ -37,9 +37,9 @@
* Current period (set by dmasound.c)
*/
-u_short amiga_audio_period = MAX_PERIOD;
+unsigned short amiga_audio_period = MAX_PERIOD;
-static u_long clock_constant;
+static unsigned long clock_constant;
void __init amiga_init_sound(void)
{
@@ -76,7 +76,7 @@
del_timer( &sound_timer );
if (hz > 20 && hz < 32767) {
- u_long period = (clock_constant / hz);
+ unsigned long period = (clock_constant / hz);
if (period < amiga_audio_min_period)
period = amiga_audio_min_period;
@@ -86,7 +86,7 @@
/* setup pointer to data, period, length and volume */
custom.aud[2].audlc = snd_data;
custom.aud[2].audlen = sizeof(sine_data)/2;
- custom.aud[2].audper = (u_short)period;
+ custom.aud[2].audper = (unsigned short)period;
custom.aud[2].audvol = 32; /* 50% of maxvol */
if (ticks) {
Index: cia.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/amiga/cia.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- cia.c 14 Jan 2001 19:34:04 -0000 1.1.1.1
+++ cia.c 10 Apr 2002 14:34:33 -0000 1.2
@@ -23,8 +23,8 @@
struct ciabase {
volatile struct CIA *cia;
- u_char icr_mask, icr_data;
- u_short int_mask;
+ unsigned char icr_mask, icr_data;
+ unsigned short int_mask;
int handler_irq, cia_irq, server_irq;
char *name;
irq_handler_t irq_list[CIA_IRQS];
@@ -46,7 +46,7 @@
unsigned char cia_set_irq(struct ciabase *base, unsigned char mask)
{
- u_char old;
+ unsigned char old;
old = (base->icr_data |= base->cia->icr);
if (mask & CIA_ICR_SETCLR)
@@ -65,7 +65,7 @@
unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
{
- u_char old, tmp;
+ unsigned char old, tmp;
int i;
old = base->icr_mask;
@@ -91,7 +91,7 @@
void (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
- u_char mask;
+ unsigned char mask;
base->irq_list[irq].handler = handler;
base->irq_list[irq].flags = flags;
Index: config.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/amiga/config.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.c 14 Jan 2001 19:34:08 -0000 1.1.1.1
+++ config.c 10 Apr 2002 14:34:33 -0000 1.2
@@ -16,7 +16,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
-#include <linux/kd.h>
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/init.h>
@@ -31,6 +30,7 @@
#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/irq.h>
+#include <asm/rtc.h>
#include <asm/keyboard.h>
#include <asm/machdep.h>
#include <asm/io.h>
@@ -44,22 +44,22 @@
unsigned char amiga_psfreq;
struct amiga_hw_present amiga_hw_present;
-static const char s_a500[] __initdata = "A500";
-static const char s_a500p[] __initdata = "A500+";
-static const char s_a600[] __initdata = "A600";
-static const char s_a1000[] __initdata = "A1000";
-static const char s_a1200[] __initdata = "A1200";
-static const char s_a2000[] __initdata = "A2000";
-static const char s_a2500[] __initdata = "A2500";
-static const char s_a3000[] __initdata = "A3000";
-static const char s_a3000t[] __initdata = "A3000T";
-static const char s_a3000p[] __initdata = "A3000+";
-static const char s_a4000[] __initdata = "A4000";
-static const char s_a4000t[] __initdata = "A4000T";
-static const char s_cdtv[] __initdata = "CDTV";
-static const char s_cd32[] __initdata = "CD32";
-static const char s_draco[] __initdata = "Draco";
-static const char *amiga_models[] __initdata = {
+static char s_a500[] __initdata = "A500";
+static char s_a500p[] __initdata = "A500+";
+static char s_a600[] __initdata = "A600";
+static char s_a1000[] __initdata = "A1000";
+static char s_a1200[] __initdata = "A1200";
+static char s_a2000[] __initdata = "A2000";
+static char s_a2500[] __initdata = "A2500";
+static char s_a3000[] __initdata = "A3000";
+static char s_a3000t[] __initdata = "A3000T";
+static char s_a3000p[] __initdata = "A3000+";
+static char s_a4000[] __initdata = "A4000";
+static char s_a4000t[] __initdata = "A4000T";
+static char s_cdtv[] __initdata = "CDTV";
+static char s_cd32[] __initdata = "CD32";
+static char s_draco[] __initdata = "Draco";
+static char *amiga_models[] __initdata = {
s_a500, s_a500p, s_a600, s_a1000, s_a1200, s_a2000, s_a2500, s_a3000,
s_a3000t, s_a3000p, s_a4000, s_a4000t, s_cdtv, s_cd32, s_draco,
};
@@ -767,20 +767,6 @@
break;
}
return 0;
-}
-
-void dbprintf(const char *fmt , ...)
-{
- static char buf[1024];
- va_list args;
- extern void console_print (const char *str);
- extern int vsprintf(char * buf, const char * fmt, va_list args);
-
- va_start(args, fmt);
- vsprintf(buf, fmt, args);
- va_end(args);
-
- console_print (buf);
}
static NORET_TYPE void amiga_reset( void )
Index: pcmcia.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/amiga/pcmcia.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pcmcia.c 14 Jan 2001 19:34:09 -0000 1.1.1.1
+++ pcmcia.c 10 Apr 2002 14:34:33 -0000 1.2
@@ -19,7 +19,7 @@
#include <asm/amipcmcia.h>
/* gayle config byte for program voltage and access speed */
-static u_char cfg_byte = GAYLE_CFG_0V|GAYLE_CFG_150NS;
+static unsigned char cfg_byte = GAYLE_CFG_0V|GAYLE_CFG_150NS;
void pcmcia_reset(void)
{
@@ -64,7 +64,7 @@
void pcmcia_program_voltage(int voltage)
{
- u_char v;
+ unsigned char v;
switch (voltage) {
case PCMCIA_0V:
@@ -87,7 +87,7 @@
void pcmcia_access_speed(int speed)
{
- u_char s;
+ unsigned char s;
if (speed <= PCMCIA_SPEED_100NS)
s = GAYLE_CFG_100NS;
|
