| config.c (1da177e4c3f41524e886b7f1b8a0c1fc7321cac2) | config.c (b4290a23cfa9040e2f0de5ab57d6ea65abaf053b) |
|---|---|
| 1/* 2 * linux/arch/m68k/amiga/config.c 3 * 4 * Copyright (C) 1993 Hamish Macdonald 5 * 6 * This file is subject to the terms and conditions of the GNU General Public 7 * License. See the file COPYING in the main directory of this archive 8 * for more details. --- 276 unchanged lines hidden (view full) --- 285 AMIGAHW_SET(AMI_PARALLEL); 286 AMIGAHW_SET(CHIP_RAM); 287 AMIGAHW_SET(PAULA); 288 289 switch(amiga_chipset) { 290 case CS_OCS: 291 case CS_ECS: 292 case CS_AGA: | 1/* 2 * linux/arch/m68k/amiga/config.c 3 * 4 * Copyright (C) 1993 Hamish Macdonald 5 * 6 * This file is subject to the terms and conditions of the GNU General Public 7 * License. See the file COPYING in the main directory of this archive 8 * for more details. --- 276 unchanged lines hidden (view full) --- 285 AMIGAHW_SET(AMI_PARALLEL); 286 AMIGAHW_SET(CHIP_RAM); 287 AMIGAHW_SET(PAULA); 288 289 switch(amiga_chipset) { 290 case CS_OCS: 291 case CS_ECS: 292 case CS_AGA: |
| 293 switch (custom.deniseid & 0xf) { | 293 switch (amiga_custom.deniseid & 0xf) { |
| 294 case 0x0c: 295 AMIGAHW_SET(DENISE_HR); 296 break; 297 case 0x08: 298 AMIGAHW_SET(LISA); 299 break; 300 } 301 break; 302 default: 303 AMIGAHW_SET(DENISE); 304 break; 305 } | 294 case 0x0c: 295 AMIGAHW_SET(DENISE_HR); 296 break; 297 case 0x08: 298 AMIGAHW_SET(LISA); 299 break; 300 } 301 break; 302 default: 303 AMIGAHW_SET(DENISE); 304 break; 305 } |
| 306 switch ((custom.vposr>>8) & 0x7f) { | 306 switch ((amiga_custom.vposr>>8) & 0x7f) { |
| 307 case 0x00: 308 AMIGAHW_SET(AGNUS_PAL); 309 break; 310 case 0x10: 311 AMIGAHW_SET(AGNUS_NTSC); 312 break; 313 case 0x20: 314 case 0x21: --- 127 unchanged lines hidden (view full) --- 442 mach_heartbeat = amiga_heartbeat; 443#endif 444 445 /* Fill in the clock values (based on the 700 kHz E-Clock) */ 446 amiga_masterclock = 40*amiga_eclock; /* 28 MHz */ 447 amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */ 448 449 /* clear all DMA bits */ | 307 case 0x00: 308 AMIGAHW_SET(AGNUS_PAL); 309 break; 310 case 0x10: 311 AMIGAHW_SET(AGNUS_NTSC); 312 break; 313 case 0x20: 314 case 0x21: --- 127 unchanged lines hidden (view full) --- 442 mach_heartbeat = amiga_heartbeat; 443#endif 444 445 /* Fill in the clock values (based on the 700 kHz E-Clock) */ 446 amiga_masterclock = 40*amiga_eclock; /* 28 MHz */ 447 amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */ 448 449 /* clear all DMA bits */ |
| 450 custom.dmacon = DMAF_ALL; | 450 amiga_custom.dmacon = DMAF_ALL; |
| 451 /* ensure that the DMA master bit is set */ | 451 /* ensure that the DMA master bit is set */ |
| 452 custom.dmacon = DMAF_SETCLR | DMAF_MASTER; | 452 amiga_custom.dmacon = DMAF_SETCLR | DMAF_MASTER; |
| 453 454 /* don't use Z2 RAM as system memory on Z3 capable machines */ 455 if (AMIGAHW_PRESENT(ZORRO3)) { 456 int i, j; 457 u32 disabled_z2mem = 0; 458 for (i = 0; i < m68k_num_memory; i++) 459 if (m68k_memory[i].addr < 16*1024*1024) { 460 if (i == 0) { --- 364 unchanged lines hidden (view full) --- 825 savekmsg->magic1 = SAVEKMSG_MAGIC1; 826 savekmsg->magic2 = SAVEKMSG_MAGIC2; 827 savekmsg->magicptr = ZTWO_PADDR(savekmsg); 828 savekmsg->size = 0; 829} 830 831static void amiga_serial_putc(char c) 832{ | 453 454 /* don't use Z2 RAM as system memory on Z3 capable machines */ 455 if (AMIGAHW_PRESENT(ZORRO3)) { 456 int i, j; 457 u32 disabled_z2mem = 0; 458 for (i = 0; i < m68k_num_memory; i++) 459 if (m68k_memory[i].addr < 16*1024*1024) { 460 if (i == 0) { --- 364 unchanged lines hidden (view full) --- 825 savekmsg->magic1 = SAVEKMSG_MAGIC1; 826 savekmsg->magic2 = SAVEKMSG_MAGIC2; 827 savekmsg->magicptr = ZTWO_PADDR(savekmsg); 828 savekmsg->size = 0; 829} 830 831static void amiga_serial_putc(char c) 832{ |
| 833 custom.serdat = (unsigned char)c | 0x100; 834 while (!(custom.serdatr & 0x2000)) | 833 amiga_custom.serdat = (unsigned char)c | 0x100; 834 while (!(amiga_custom.serdatr & 0x2000)) |
| 835 ; 836} 837 838void amiga_serial_console_write(struct console *co, const char *s, 839 unsigned int count) 840{ 841 while (count--) { 842 if (*s == '\n') --- 7 unchanged lines hidden (view full) --- 850{ 851 amiga_serial_console_write(NULL, s, strlen(s)); 852} 853 854int amiga_serial_console_wait_key(struct console *co) 855{ 856 int ch; 857 | 835 ; 836} 837 838void amiga_serial_console_write(struct console *co, const char *s, 839 unsigned int count) 840{ 841 while (count--) { 842 if (*s == '\n') --- 7 unchanged lines hidden (view full) --- 850{ 851 amiga_serial_console_write(NULL, s, strlen(s)); 852} 853 854int amiga_serial_console_wait_key(struct console *co) 855{ 856 int ch; 857 |
| 858 while (!(custom.intreqr & IF_RBF)) | 858 while (!(amiga_custom.intreqr & IF_RBF)) |
| 859 barrier(); | 859 barrier(); |
| 860 ch = custom.serdatr & 0xff; | 860 ch = amiga_custom.serdatr & 0xff; |
| 861 /* clear the interrupt, so that another character can be read */ | 861 /* clear the interrupt, so that another character can be read */ |
| 862 custom.intreq = IF_RBF; | 862 amiga_custom.intreq = IF_RBF; |
| 863 return ch; 864} 865 866void amiga_serial_gets(struct console *co, char *s, int len) 867{ 868 int ch, cnt = 0; 869 870 while (1) { --- 137 unchanged lines hidden --- | 863 return ch; 864} 865 866void amiga_serial_gets(struct console *co, char *s, int len) 867{ 868 int ch, cnt = 0; 869 870 while (1) { --- 137 unchanged lines hidden --- |