Piggyback MIPS changes and add ARM syscons support for devices with
framebuffer While here - sort #if defined() order alphabetically
This commit is contained in:
Oleksandr Tymoshenko
parent
69714daa44
commit
e1f04cd024
90
sys/arm/arm/sc_machdep.c
Normal file
90
sys/arm/arm/sc_machdep.c
Normal file
@ -0,0 +1,90 @@
|
||||
/*-
|
||||
* Copyright (c) 2003 Jake Burkholder.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/module.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/cons.h>
|
||||
#include <sys/kbio.h>
|
||||
#include <sys/consio.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include <dev/syscons/syscons.h>
|
||||
|
||||
static sc_softc_t sc_softcs[8];
|
||||
|
||||
int
|
||||
sc_get_cons_priority(int *unit, int *flags)
|
||||
{
|
||||
|
||||
*unit = 0;
|
||||
*flags = 0;
|
||||
return (CN_INTERNAL);
|
||||
}
|
||||
|
||||
int
|
||||
sc_max_unit(void)
|
||||
{
|
||||
return (1);
|
||||
}
|
||||
|
||||
sc_softc_t *
|
||||
sc_get_softc(int unit, int flags)
|
||||
{
|
||||
sc_softc_t *sc;
|
||||
|
||||
if (unit < 0)
|
||||
return (NULL);
|
||||
sc = &sc_softcs[unit];
|
||||
sc->unit = unit;
|
||||
if ((sc->flags & SC_INIT_DONE) == 0) {
|
||||
sc->keyboard = -1;
|
||||
sc->adapter = -1;
|
||||
sc->cursor_char = SC_CURSOR_CHAR;
|
||||
sc->mouse_char = SC_MOUSE_CHAR;
|
||||
}
|
||||
return (sc);
|
||||
}
|
||||
|
||||
void
|
||||
sc_get_bios_values(bios_values_t *values)
|
||||
{
|
||||
values->cursor_start = 0;
|
||||
values->cursor_end = 32;
|
||||
values->shift_state = 0;
|
||||
}
|
||||
|
||||
int
|
||||
sc_tone(int hz)
|
||||
{
|
||||
return (0);
|
||||
}
|
||||
71
sys/arm/include/sc_machdep.h
Normal file
71
sys/arm/include/sc_machdep.h
Normal file
@ -0,0 +1,71 @@
|
||||
/*-
|
||||
* Copyright (c) 2003 Jake Burkholder.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_SC_MACHDEP_H_
|
||||
#define _MACHINE_SC_MACHDEP_H_
|
||||
|
||||
/* Color attributes for foreground text */
|
||||
|
||||
#define FG_BLACK 0x0
|
||||
#define FG_BLUE 0x1
|
||||
#define FG_GREEN 0x2
|
||||
#define FG_CYAN 0x3
|
||||
#define FG_RED 0x4
|
||||
#define FG_MAGENTA 0x5
|
||||
#define FG_BROWN 0x6
|
||||
#define FG_LIGHTGREY 0x7 /* aka white */
|
||||
#define FG_DARKGREY 0x8
|
||||
#define FG_LIGHTBLUE 0x9
|
||||
#define FG_LIGHTGREEN 0xa
|
||||
#define FG_LIGHTCYAN 0xb
|
||||
#define FG_LIGHTRED 0xc
|
||||
#define FG_LIGHTMAGENTA 0xd
|
||||
#define FG_YELLOW 0xe
|
||||
#define FG_WHITE 0xf /* aka bright white */
|
||||
#define FG_BLINK 0x80
|
||||
|
||||
/* Color attributes for text background */
|
||||
|
||||
#define BG_BLACK 0x00
|
||||
#define BG_BLUE 0x10
|
||||
#define BG_GREEN 0x20
|
||||
#define BG_CYAN 0x30
|
||||
#define BG_RED 0x40
|
||||
#define BG_MAGENTA 0x50
|
||||
#define BG_BROWN 0x60
|
||||
#define BG_LIGHTGREY 0x70
|
||||
#define BG_DARKGREY 0x80
|
||||
#define BG_LIGHTBLUE 0x90
|
||||
#define BG_LIGHTGREEN 0xa0
|
||||
#define BG_LIGHTCYAN 0xb0
|
||||
#define BG_LIGHTRED 0xc0
|
||||
#define BG_LIGHTMAGENTA 0xd0
|
||||
#define BG_YELLOW 0xe0
|
||||
#define BG_WHITE 0xf0
|
||||
|
||||
#endif /* !_MACHINE_SC_MACHDEP_H_ */
|
||||
@ -1,4 +1,9 @@
|
||||
# $FreeBSD$
|
||||
font.h optional sc \
|
||||
compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
|
||||
no-obj no-implicit-rule before-depend \
|
||||
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
|
||||
|
||||
crypto/blowfish/bf_enc.c optional crypto | ipsec
|
||||
crypto/des/des_enc.c optional crypto | ipsec | netsmb
|
||||
arm/arm/autoconf.c standard
|
||||
@ -37,6 +42,7 @@ arm/arm/nexus.c standard
|
||||
arm/arm/pl310.c optional pl310
|
||||
arm/arm/pmap.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_sa1100 | cpu_sa1110 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0
|
||||
arm/arm/pmap-v6.c optional cpu_arm11 | cpu_cortexa | cpu_mv_pj4b
|
||||
arm/arm/sc_machdep.c optional sc
|
||||
arm/arm/setcpsr.S standard
|
||||
arm/arm/setstack.s standard
|
||||
arm/arm/stack_machdep.c optional ddb | stack
|
||||
@ -53,13 +59,18 @@ arm/fpe-arm/armfpe_glue.S optional armfpe
|
||||
arm/fpe-arm/armfpe_init.c optional armfpe
|
||||
arm/fpe-arm/armfpe.S optional armfpe
|
||||
cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs compile-with "${ZFS_C}"
|
||||
dev/fb/fb.c optional sc
|
||||
dev/hwpmc/hwpmc_arm.c optional hwpmc
|
||||
dev/kbd/kbd.c optional sc
|
||||
dev/ofw/openfirm.c optional fdt
|
||||
dev/ofw/openfirmio.c optional fdt
|
||||
dev/ofw/ofw_bus_if.m optional fdt
|
||||
dev/ofw/ofw_if.m optional fdt
|
||||
dev/ofw/ofw_bus_subr.c optional fdt
|
||||
dev/ofw/ofw_fdt.c optional fdt
|
||||
dev/syscons/scgfbrndr.c optional sc
|
||||
dev/syscons/scterm-teken.c optional sc
|
||||
dev/syscons/scvtb.c optional sc
|
||||
geom/geom_bsd.c optional geom_bsd
|
||||
geom/geom_bsd_enc.c optional geom_bsd
|
||||
geom/geom_mbr.c optional geom_mbr
|
||||
|
||||
@ -55,4 +55,7 @@ VM_MAXUSER_ADDRESS opt_global.h
|
||||
AT91_ATE_USE_RMII opt_at91.h
|
||||
AT91_MCI_HAS_4WIRE opt_at91.h
|
||||
AT91_MCI_SLOT_B opt_at91.h
|
||||
GFB_DEBUG opt_gfb.h
|
||||
GFB_NO_FONT_LOADING opt_gfb.h
|
||||
GFB_NO_MODE_CHANGE opt_gfb.h
|
||||
AT91C_MAIN_CLOCK opt_at91.h
|
||||
|
||||
@ -92,7 +92,7 @@ void ofwfb_fillw(int pat, void *base, size_t cnt);
|
||||
u_int16_t ofwfb_readw(u_int16_t *addr);
|
||||
void ofwfb_writew(u_int16_t *addr, u_int16_t val);
|
||||
|
||||
#elif defined(__mips__)
|
||||
#elif defined(__mips__) || defined(__arm__)
|
||||
|
||||
/*
|
||||
* Use amd64/i386-like settings under the assumption that MIPS-based display
|
||||
@ -115,6 +115,11 @@ fillw(int val, uint16_t *buf, size_t size)
|
||||
}
|
||||
#define fillw_io(p, d, c) fillw((p), (void *)(d), (c))
|
||||
|
||||
#if defined(__arm__)
|
||||
#define readw(a) (*(uint16_t*)(a))
|
||||
#define writew(a, v) (*(uint16_t*)(a) = (v))
|
||||
#endif
|
||||
|
||||
#else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */
|
||||
#define bcopy_io(s, d, c) memcpy_io((d), (s), (c))
|
||||
#define bcopy_toio(s, d, c) memcpy_toio((d), (void *)(s), (c))
|
||||
|
||||
@ -42,7 +42,8 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
|
||||
#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
|
||||
#if defined(__arm__) || defined(__mips__) || \
|
||||
defined(__powerpc__) || defined(__sparc64__)
|
||||
#include <machine/sc_machdep.h>
|
||||
#else
|
||||
#include <machine/pc/display.h>
|
||||
|
||||
@ -40,7 +40,8 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/consio.h>
|
||||
#include <sys/kbio.h>
|
||||
|
||||
#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
|
||||
#if defined(__arm__) || defined(__mips__) || \
|
||||
defined(__powerpc__) || defined(__sparc64__)
|
||||
#include <machine/sc_machdep.h>
|
||||
#else
|
||||
#include <machine/pc/display.h>
|
||||
|
||||
@ -62,7 +62,8 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/power.h>
|
||||
|
||||
#include <machine/clock.h>
|
||||
#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
|
||||
#if defined(__arm__) || defined(__mips__) || \
|
||||
defined(__powerpc__) || defined(__sparc64__)
|
||||
#include <machine/sc_machdep.h>
|
||||
#else
|
||||
#include <machine/pc/display.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user