2003-09-25 20:15:53 +00:00
|
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2004-03-14 17:48:25 +00:00
|
|
|
|
* Copyright (C) 2000,2001,2002,2003,2004 Free Software Foundation, Inc.
|
2003-09-25 20:15:53 +00:00
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#include <grub/machine/vga.h>
|
|
|
|
|
#include <grub/machine/console.h>
|
|
|
|
|
#include <grub/term.h>
|
|
|
|
|
#include <grub/types.h>
|
|
|
|
|
#include <grub/dl.h>
|
|
|
|
|
#include <grub/misc.h>
|
|
|
|
|
#include <grub/normal.h>
|
|
|
|
|
#include <grub/font.h>
|
|
|
|
|
#include <grub/arg.h>
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
#define DEBUG_VGA 0
|
|
|
|
|
|
|
|
|
|
#define VGA_WIDTH 640
|
2004-11-01 16:19:30 +00:00
|
|
|
|
#define VGA_HEIGHT 350
|
2003-09-25 20:15:53 +00:00
|
|
|
|
#define CHAR_WIDTH 8
|
|
|
|
|
#define CHAR_HEIGHT 16
|
|
|
|
|
#define TEXT_WIDTH (VGA_WIDTH / CHAR_WIDTH)
|
|
|
|
|
#define TEXT_HEIGHT (VGA_HEIGHT / CHAR_HEIGHT)
|
|
|
|
|
#define VGA_MEM ((unsigned char *) 0xA0000)
|
2004-11-01 16:19:30 +00:00
|
|
|
|
#define PAGE_OFFSET(x) ((x) * (VGA_WIDTH * VGA_HEIGHT / 8))
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
#define DEFAULT_FG_COLOR 0xa
|
|
|
|
|
#define DEFAULT_BG_COLOR 0x0
|
|
|
|
|
|
|
|
|
|
struct colored_char
|
|
|
|
|
{
|
|
|
|
|
/* An Unicode codepoint. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint32_t code;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
/* Color indexes. */
|
|
|
|
|
unsigned char fg_color;
|
|
|
|
|
unsigned char bg_color;
|
|
|
|
|
|
|
|
|
|
/* The width of this character minus one. */
|
|
|
|
|
unsigned char width;
|
|
|
|
|
|
|
|
|
|
/* The column index of this character. */
|
|
|
|
|
unsigned char index;
|
|
|
|
|
};
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_dl_t my_mod;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
static unsigned char text_mode;
|
|
|
|
|
static unsigned xpos, ypos;
|
|
|
|
|
static int cursor_state;
|
|
|
|
|
static unsigned char fg_color, bg_color;
|
|
|
|
|
static struct colored_char text_buf[TEXT_WIDTH * TEXT_HEIGHT];
|
|
|
|
|
static unsigned char *vga_font;
|
|
|
|
|
static unsigned char saved_map_mask;
|
2004-11-01 16:19:30 +00:00
|
|
|
|
static int page = 0;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
/* Read a byte from a port. */
|
|
|
|
|
static inline unsigned char
|
|
|
|
|
inb (unsigned short port)
|
|
|
|
|
{
|
|
|
|
|
unsigned char value;
|
|
|
|
|
|
|
|
|
|
asm volatile ("inb %w1, %0" : "=a" (value) : "Nd" (port));
|
|
|
|
|
asm volatile ("outb %%al, $0x80" : : );
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write a byte to a port. */
|
|
|
|
|
static inline void
|
|
|
|
|
outb (unsigned short port, unsigned char value)
|
|
|
|
|
{
|
|
|
|
|
asm volatile ("outb %b0, %w1" : : "a" (value), "Nd" (port));
|
|
|
|
|
asm volatile ("outb %%al, $0x80" : : );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define SEQUENCER_ADDR_PORT 0x3C4
|
|
|
|
|
#define SEQUENCER_DATA_PORT 0x3C5
|
|
|
|
|
#define MAP_MASK_REGISTER 0x02
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
#define CRTC_ADDR_PORT 0x3D4
|
|
|
|
|
#define CRTC_DATA_PORT 0x3D5
|
|
|
|
|
#define START_ADDR_HIGH_REGISTER 0x0C
|
|
|
|
|
#define START_ADDR_LOW_REGISTER 0x0D
|
|
|
|
|
|
|
|
|
|
#define GRAPHICS_ADDR_PORT 0x3CE
|
|
|
|
|
#define GRAPHICS_DATA_PORT 0x3CF
|
|
|
|
|
#define READ_MAP_REGISTER 0x04
|
|
|
|
|
|
|
|
|
|
#define INPUT_STATUS1_REGISTER 0x3DA
|
|
|
|
|
#define INPUT_STATUS1_VERTR_BIT 0x08
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
wait_vretrace (void)
|
|
|
|
|
{
|
|
|
|
|
/* Wait until there is a vertical retrace. */
|
|
|
|
|
while (! (inb (INPUT_STATUS1_REGISTER) & INPUT_STATUS1_VERTR_BIT));
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-25 20:15:53 +00:00
|
|
|
|
/* Get Map Mask Register. */
|
|
|
|
|
static unsigned char
|
|
|
|
|
get_map_mask (void)
|
|
|
|
|
{
|
|
|
|
|
unsigned char old_addr;
|
|
|
|
|
unsigned char old_data;
|
|
|
|
|
|
|
|
|
|
old_addr = inb (SEQUENCER_ADDR_PORT);
|
|
|
|
|
outb (SEQUENCER_ADDR_PORT, MAP_MASK_REGISTER);
|
|
|
|
|
|
|
|
|
|
old_data = inb (SEQUENCER_DATA_PORT);
|
|
|
|
|
|
|
|
|
|
outb (SEQUENCER_ADDR_PORT, old_addr);
|
|
|
|
|
|
|
|
|
|
return old_data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set Map Mask Register. */
|
|
|
|
|
static void
|
|
|
|
|
set_map_mask (unsigned char mask)
|
|
|
|
|
{
|
|
|
|
|
unsigned char old_addr;
|
|
|
|
|
|
|
|
|
|
old_addr = inb (SEQUENCER_ADDR_PORT);
|
|
|
|
|
outb (SEQUENCER_ADDR_PORT, MAP_MASK_REGISTER);
|
|
|
|
|
|
|
|
|
|
outb (SEQUENCER_DATA_PORT, mask);
|
|
|
|
|
|
|
|
|
|
outb (SEQUENCER_ADDR_PORT, old_addr);
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
/* Set Read Map Register. */
|
|
|
|
|
static void
|
|
|
|
|
set_read_map (unsigned char map)
|
|
|
|
|
{
|
|
|
|
|
unsigned char old_addr;
|
|
|
|
|
|
|
|
|
|
old_addr = inb (GRAPHICS_ADDR_PORT);
|
|
|
|
|
|
|
|
|
|
outb (GRAPHICS_ADDR_PORT, READ_MAP_REGISTER);
|
|
|
|
|
outb (GRAPHICS_DATA_PORT, map);
|
|
|
|
|
|
|
|
|
|
outb (GRAPHICS_ADDR_PORT, old_addr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set start address. */
|
|
|
|
|
static void
|
|
|
|
|
set_start_address (unsigned int start)
|
|
|
|
|
{
|
|
|
|
|
unsigned char old_addr;
|
|
|
|
|
|
|
|
|
|
old_addr = inb (CRTC_ADDR_PORT);
|
|
|
|
|
|
|
|
|
|
outb (CRTC_ADDR_PORT, START_ADDR_LOW_REGISTER);
|
|
|
|
|
outb (CRTC_DATA_PORT, start & 0xFF);
|
|
|
|
|
|
|
|
|
|
outb (CRTC_ADDR_PORT, START_ADDR_HIGH_REGISTER);
|
|
|
|
|
outb (CRTC_DATA_PORT, start >> 8);
|
|
|
|
|
|
|
|
|
|
outb (CRTC_ADDR_PORT, old_addr);
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_vga_init (void)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
vga_font = grub_vga_get_font ();
|
2004-11-01 16:19:30 +00:00
|
|
|
|
text_mode = grub_vga_set_mode (0x10);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
cursor_state = 1;
|
|
|
|
|
fg_color = DEFAULT_FG_COLOR;
|
|
|
|
|
bg_color = DEFAULT_BG_COLOR;
|
|
|
|
|
saved_map_mask = get_map_mask ();
|
|
|
|
|
set_map_mask (0x0f);
|
2004-11-01 16:19:30 +00:00
|
|
|
|
set_start_address (PAGE_OFFSET (page));
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_vga_fini (void)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
|
|
|
|
set_map_mask (saved_map_mask);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_vga_set_mode (text_mode);
|
|
|
|
|
return GRUB_ERR_NONE;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2004-04-04 13:46:03 +00:00
|
|
|
|
get_vga_glyph (grub_uint32_t code, unsigned char bitmap[32], unsigned *width)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
|
|
|
|
if (code > 0x7f)
|
|
|
|
|
{
|
|
|
|
|
/* Map some unicode characters to the VGA font, if possible. */
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case 0x2190: /* left arrow */
|
|
|
|
|
code = 0x1b;
|
|
|
|
|
break;
|
|
|
|
|
case 0x2191: /* up arrow */
|
|
|
|
|
code = 0x18;
|
|
|
|
|
break;
|
|
|
|
|
case 0x2192: /* right arrow */
|
|
|
|
|
code = 0x1a;
|
|
|
|
|
break;
|
|
|
|
|
case 0x2193: /* down arrow */
|
|
|
|
|
code = 0x19;
|
|
|
|
|
break;
|
|
|
|
|
case 0x2501: /* horizontal line */
|
|
|
|
|
code = 0xc4;
|
|
|
|
|
break;
|
|
|
|
|
case 0x2503: /* vertical line */
|
|
|
|
|
code = 0xb3;
|
|
|
|
|
break;
|
|
|
|
|
case 0x250F: /* upper-left corner */
|
|
|
|
|
code = 0xda;
|
|
|
|
|
break;
|
|
|
|
|
case 0x2513: /* upper-right corner */
|
|
|
|
|
code = 0xbf;
|
|
|
|
|
break;
|
|
|
|
|
case 0x2517: /* lower-left corner */
|
|
|
|
|
code = 0xc0;
|
|
|
|
|
break;
|
|
|
|
|
case 0x251B: /* lower-right corner */
|
|
|
|
|
code = 0xd9;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_font_get_glyph (code, bitmap, width);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bitmap)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_memcpy (bitmap, vga_font + code * CHAR_HEIGHT, CHAR_HEIGHT);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
*width = 1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
invalidate_char (struct colored_char *p)
|
|
|
|
|
{
|
|
|
|
|
p->code = 0xFFFF;
|
|
|
|
|
|
|
|
|
|
if (p->width)
|
|
|
|
|
{
|
|
|
|
|
struct colored_char *q;
|
|
|
|
|
|
|
|
|
|
for (q = p + 1; q <= p + p->width; q++)
|
|
|
|
|
{
|
|
|
|
|
q->code = 0xFFFF;
|
|
|
|
|
q->width = 0;
|
|
|
|
|
q->index = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p->width = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
check_vga_mem (void *p)
|
|
|
|
|
{
|
2004-11-01 16:19:30 +00:00
|
|
|
|
return (p >= (void *) (VGA_MEM + PAGE_OFFSET (page))
|
|
|
|
|
&& p <= (void *) (VGA_MEM + PAGE_OFFSET (page)
|
|
|
|
|
+ VGA_WIDTH * VGA_HEIGHT / 8));
|
2003-09-25 20:15:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
write_char (void)
|
|
|
|
|
{
|
|
|
|
|
struct colored_char *p = text_buf + xpos + ypos * TEXT_WIDTH;
|
|
|
|
|
unsigned char bitmap[32];
|
|
|
|
|
unsigned width;
|
2004-11-01 16:19:30 +00:00
|
|
|
|
unsigned char *mem_base;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
unsigned plane;
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
mem_base = (VGA_MEM + xpos +
|
|
|
|
|
ypos * CHAR_HEIGHT * TEXT_WIDTH + PAGE_OFFSET (page)) - p->index;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
p -= p->index;
|
|
|
|
|
|
|
|
|
|
if (! get_vga_glyph (p->code, bitmap, &width))
|
|
|
|
|
invalidate_char (p);
|
|
|
|
|
|
|
|
|
|
for (plane = 0x01; plane <= 0x08; plane <<= 1)
|
|
|
|
|
{
|
|
|
|
|
unsigned y;
|
|
|
|
|
unsigned offset;
|
|
|
|
|
unsigned char *mem;
|
|
|
|
|
|
|
|
|
|
set_map_mask (plane);
|
|
|
|
|
|
|
|
|
|
for (y = 0, offset = 0, mem = mem_base;
|
|
|
|
|
y < CHAR_HEIGHT;
|
|
|
|
|
y++, mem += TEXT_WIDTH)
|
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < width && offset < 32; i++)
|
|
|
|
|
{
|
|
|
|
|
unsigned char fg_mask, bg_mask;
|
|
|
|
|
|
|
|
|
|
fg_mask = (p->fg_color & plane) ? bitmap[offset] : 0;
|
|
|
|
|
bg_mask = (p->bg_color & plane) ? ~(bitmap[offset]) : 0;
|
|
|
|
|
offset++;
|
|
|
|
|
|
|
|
|
|
if (check_vga_mem (mem + i))
|
|
|
|
|
mem[i] = (fg_mask | bg_mask);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
set_map_mask (0x0f);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
write_cursor (void)
|
|
|
|
|
{
|
2004-11-01 16:19:30 +00:00
|
|
|
|
unsigned char *mem = (VGA_MEM + PAGE_OFFSET (page) + xpos
|
2003-09-25 20:15:53 +00:00
|
|
|
|
+ (ypos * CHAR_HEIGHT + CHAR_HEIGHT - 3) * TEXT_WIDTH);
|
|
|
|
|
if (check_vga_mem (mem))
|
|
|
|
|
*mem = 0xff;
|
|
|
|
|
|
|
|
|
|
mem += TEXT_WIDTH;
|
|
|
|
|
if (check_vga_mem (mem))
|
|
|
|
|
*mem = 0xff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
scroll_up (void)
|
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
unsigned plane;
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
/* Do all the work in the other page. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_memmove (text_buf, text_buf + TEXT_WIDTH,
|
2003-09-25 20:15:53 +00:00
|
|
|
|
sizeof (struct colored_char) * TEXT_WIDTH * (TEXT_HEIGHT - 1));
|
|
|
|
|
|
|
|
|
|
for (i = TEXT_WIDTH * (TEXT_HEIGHT - 1); i < TEXT_WIDTH * TEXT_HEIGHT; i++)
|
|
|
|
|
{
|
|
|
|
|
text_buf[i].code = ' ';
|
|
|
|
|
text_buf[i].fg_color = 0;
|
|
|
|
|
text_buf[i].bg_color = 0;
|
|
|
|
|
text_buf[i].width = 0;
|
|
|
|
|
text_buf[i].index = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
for (plane = 1; plane <= 4; plane++)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
2004-11-01 16:19:30 +00:00
|
|
|
|
set_read_map (plane);
|
|
|
|
|
set_map_mask (1 << plane);
|
|
|
|
|
grub_memmove (VGA_MEM + PAGE_OFFSET (1 - page), VGA_MEM
|
|
|
|
|
+ PAGE_OFFSET (page) + VGA_WIDTH * CHAR_HEIGHT / 8,
|
2003-09-25 20:15:53 +00:00
|
|
|
|
VGA_WIDTH * (VGA_HEIGHT - CHAR_HEIGHT) / 8);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
set_map_mask (0x0f);
|
2004-11-01 16:19:30 +00:00
|
|
|
|
grub_memset (VGA_MEM + PAGE_OFFSET (1 - page)
|
|
|
|
|
+ VGA_WIDTH * (VGA_HEIGHT - CHAR_HEIGHT) / 8, 0,
|
2003-09-25 20:15:53 +00:00
|
|
|
|
VGA_WIDTH * CHAR_HEIGHT / 8);
|
2004-11-01 16:19:30 +00:00
|
|
|
|
|
|
|
|
|
/* Activate the other page. */
|
|
|
|
|
page = 1 - page;
|
|
|
|
|
wait_vretrace ();
|
|
|
|
|
set_start_address (PAGE_OFFSET (page));
|
2003-09-25 20:15:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_vga_putchar (grub_uint32_t c)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
|
#if DEBUG_VGA
|
2003-09-25 20:15:53 +00:00
|
|
|
|
static int show = 1;
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
|
#endif
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
if (c == '\a')
|
|
|
|
|
/* FIXME */
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (c == '\b' || c == '\n' || c == '\r')
|
|
|
|
|
{
|
|
|
|
|
/* Erase current cursor, if any. */
|
|
|
|
|
if (cursor_state)
|
|
|
|
|
write_char ();
|
|
|
|
|
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case '\b':
|
|
|
|
|
if (xpos > 0)
|
|
|
|
|
xpos--;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '\n':
|
2004-11-01 16:19:30 +00:00
|
|
|
|
if (ypos >= TEXT_HEIGHT - 1)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
scroll_up ();
|
|
|
|
|
else
|
|
|
|
|
ypos++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '\r':
|
|
|
|
|
xpos = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cursor_state)
|
|
|
|
|
write_cursor ();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned width;
|
|
|
|
|
struct colored_char *p;
|
|
|
|
|
|
|
|
|
|
get_vga_glyph (c, 0, &width);
|
|
|
|
|
|
|
|
|
|
if (xpos + width > TEXT_WIDTH)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_putchar ('\n');
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
p = text_buf + xpos + ypos * TEXT_WIDTH;
|
|
|
|
|
p->code = c;
|
|
|
|
|
p->fg_color = fg_color;
|
|
|
|
|
p->bg_color = bg_color;
|
|
|
|
|
p->width = width - 1;
|
|
|
|
|
p->index = 0;
|
|
|
|
|
|
|
|
|
|
if (width > 1)
|
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
|
|
for (i = 1; i < width; i++)
|
|
|
|
|
{
|
|
|
|
|
p[i].code = ' ';
|
|
|
|
|
p[i].width = width - 1;
|
|
|
|
|
p[i].index = i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
write_char ();
|
|
|
|
|
|
|
|
|
|
xpos += width;
|
|
|
|
|
if (xpos >= TEXT_WIDTH)
|
|
|
|
|
{
|
|
|
|
|
xpos = 0;
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
if (ypos >= TEXT_HEIGHT - 1)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
scroll_up ();
|
|
|
|
|
else
|
|
|
|
|
ypos++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cursor_state)
|
|
|
|
|
write_cursor ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if DEBUG_VGA
|
|
|
|
|
if (show)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint16_t pos = grub_getxy ();
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
show = 0;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_gotoxy (0, 0);
|
|
|
|
|
grub_printf ("[%u:%u]", (unsigned) (pos >> 8), (unsigned) (pos & 0xff));
|
|
|
|
|
grub_gotoxy (pos >> 8, pos & 0xff);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
show = 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_uint16_t
|
|
|
|
|
grub_vga_getxy (void)
|
2004-03-14 17:48:25 +00:00
|
|
|
|
{
|
|
|
|
|
return ((xpos << 8) | ypos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_vga_gotoxy (grub_uint8_t x, grub_uint8_t y)
|
2004-03-14 17:48:25 +00:00
|
|
|
|
{
|
|
|
|
|
if (x >= TEXT_WIDTH || y >= TEXT_HEIGHT)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_RANGE, "invalid point (%u,%u)",
|
2004-03-14 17:48:25 +00:00
|
|
|
|
(unsigned) x, (unsigned) y);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cursor_state)
|
|
|
|
|
write_char ();
|
|
|
|
|
|
|
|
|
|
xpos = x;
|
|
|
|
|
ypos = y;
|
|
|
|
|
|
|
|
|
|
if (cursor_state)
|
|
|
|
|
write_cursor ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_vga_cls (void)
|
2004-03-14 17:48:25 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
wait_vretrace ();
|
2004-03-14 17:48:25 +00:00
|
|
|
|
for (i = 0; i < TEXT_WIDTH * TEXT_HEIGHT; i++)
|
|
|
|
|
{
|
|
|
|
|
text_buf[i].code = ' ';
|
|
|
|
|
text_buf[i].fg_color = 0;
|
|
|
|
|
text_buf[i].bg_color = 0;
|
|
|
|
|
text_buf[i].width = 0;
|
|
|
|
|
text_buf[i].index = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-01 16:19:30 +00:00
|
|
|
|
grub_memset (VGA_MEM + PAGE_OFFSET (page), 0, VGA_WIDTH * VGA_HEIGHT / 8);
|
2004-03-14 17:48:25 +00:00
|
|
|
|
|
|
|
|
|
xpos = ypos = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_vga_setcolorstate (grub_term_color_state state)
|
2004-03-14 17:48:25 +00:00
|
|
|
|
{
|
|
|
|
|
switch (state)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
case GRUB_TERM_COLOR_STANDARD:
|
|
|
|
|
case GRUB_TERM_COLOR_NORMAL:
|
2004-03-14 17:48:25 +00:00
|
|
|
|
fg_color = DEFAULT_FG_COLOR;
|
|
|
|
|
bg_color = DEFAULT_BG_COLOR;
|
|
|
|
|
break;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
case GRUB_TERM_COLOR_HIGHLIGHT:
|
2004-03-14 17:48:25 +00:00
|
|
|
|
fg_color = DEFAULT_BG_COLOR;
|
|
|
|
|
bg_color = DEFAULT_FG_COLOR;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_vga_setcolor (grub_uint8_t normal_color __attribute__ ((unused)),
|
|
|
|
|
grub_uint8_t highlight_color __attribute__ ((unused)))
|
2004-03-14 17:48:25 +00:00
|
|
|
|
{
|
|
|
|
|
/* FIXME */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_vga_setcursor (int on)
|
2004-03-14 17:48:25 +00:00
|
|
|
|
{
|
|
|
|
|
if (cursor_state != on)
|
|
|
|
|
{
|
|
|
|
|
if (cursor_state)
|
|
|
|
|
write_char ();
|
|
|
|
|
else
|
|
|
|
|
write_cursor ();
|
|
|
|
|
|
|
|
|
|
cursor_state = on;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static struct grub_term grub_vga_term =
|
2004-03-14 17:48:25 +00:00
|
|
|
|
{
|
|
|
|
|
.name = "vga",
|
2004-04-04 13:46:03 +00:00
|
|
|
|
.init = grub_vga_init,
|
|
|
|
|
.fini = grub_vga_fini,
|
|
|
|
|
.putchar = grub_vga_putchar,
|
|
|
|
|
.checkkey = grub_console_checkkey,
|
|
|
|
|
.getkey = grub_console_getkey,
|
|
|
|
|
.getxy = grub_vga_getxy,
|
|
|
|
|
.gotoxy = grub_vga_gotoxy,
|
|
|
|
|
.cls = grub_vga_cls,
|
|
|
|
|
.setcolorstate = grub_vga_setcolorstate,
|
|
|
|
|
.setcolor = grub_vga_setcolor,
|
|
|
|
|
.setcursor = grub_vga_setcursor,
|
2004-03-14 17:48:25 +00:00
|
|
|
|
.flags = 0,
|
|
|
|
|
.next = 0
|
|
|
|
|
};
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
debug_command (struct grub_arg_list *state __attribute__ ((unused)),
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
|
int argc __attribute__ ((unused)),
|
|
|
|
|
char **args __attribute__ ((unused)))
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_printf ("???????<3F><>??n");
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
GRUB_MOD_INIT
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
|
|
|
|
my_mod = mod;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_term_register (&grub_vga_term);
|
|
|
|
|
grub_register_command ("debug", debug_command, GRUB_COMMAND_FLAG_CMDLINE,
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
|
"debug", "Debug it!", 0);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
GRUB_MOD_FINI
|
2003-09-25 20:15:53 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_term_unregister (&grub_vga_term);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
}
|