2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>
All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_ and grub_, respectively. Because the conversion is trivial and mechanical, I omit the details here. Please refer to the CVS if you need more information.
This commit is contained in:
okuji
parent
6a1425510d
commit
4b13b216f4
125 changed files with 6198 additions and 6181 deletions
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 1999,2000,2001,2002,2003 Free Software Foundation, Inc.
|
||||
*
|
||||
* PUPA is free software; you can redistribute it and/or modify
|
||||
* GRUB 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.
|
||||
|
|
@ -13,69 +13,69 @@
|
|||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with PUPA; if not, write to the Free Software
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/machine/biosdisk.h>
|
||||
#include <pupa/machine/memory.h>
|
||||
#include <pupa/disk.h>
|
||||
#include <pupa/mm.h>
|
||||
#include <pupa/types.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/err.h>
|
||||
#include <pupa/term.h>
|
||||
#include <grub/machine/biosdisk.h>
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/term.h>
|
||||
|
||||
/* Drive Parameters. */
|
||||
struct pupa_biosdisk_drp
|
||||
struct grub_biosdisk_drp
|
||||
{
|
||||
pupa_uint16_t size;
|
||||
pupa_uint16_t flags;
|
||||
pupa_uint32_t cylinders;
|
||||
pupa_uint32_t heads;
|
||||
pupa_uint32_t sectors;
|
||||
pupa_uint64_t total_sectors;
|
||||
pupa_uint16_t bytes_per_sector;
|
||||
grub_uint16_t size;
|
||||
grub_uint16_t flags;
|
||||
grub_uint32_t cylinders;
|
||||
grub_uint32_t heads;
|
||||
grub_uint32_t sectors;
|
||||
grub_uint64_t total_sectors;
|
||||
grub_uint16_t bytes_per_sector;
|
||||
/* ver 2.0 or higher */
|
||||
pupa_uint32_t EDD_configuration_parameters;
|
||||
grub_uint32_t EDD_configuration_parameters;
|
||||
/* ver 3.0 or higher */
|
||||
pupa_uint16_t signature_dpi;
|
||||
pupa_uint8_t length_dpi;
|
||||
pupa_uint8_t reserved[3];
|
||||
pupa_uint8_t name_of_host_bus[4];
|
||||
pupa_uint8_t name_of_interface_type[8];
|
||||
pupa_uint8_t interface_path[8];
|
||||
pupa_uint8_t device_path[8];
|
||||
pupa_uint8_t reserved2;
|
||||
pupa_uint8_t checksum;
|
||||
grub_uint16_t signature_dpi;
|
||||
grub_uint8_t length_dpi;
|
||||
grub_uint8_t reserved[3];
|
||||
grub_uint8_t name_of_host_bus[4];
|
||||
grub_uint8_t name_of_interface_type[8];
|
||||
grub_uint8_t interface_path[8];
|
||||
grub_uint8_t device_path[8];
|
||||
grub_uint8_t reserved2;
|
||||
grub_uint8_t checksum;
|
||||
|
||||
/* XXX: This is necessary, because the BIOS of Thinkpad X20
|
||||
writes a garbage to the tail of drive parameters,
|
||||
regardless of a size specified in a caller. */
|
||||
pupa_uint8_t dummy[16];
|
||||
grub_uint8_t dummy[16];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* Disk Address Packet. */
|
||||
struct pupa_biosdisk_dap
|
||||
struct grub_biosdisk_dap
|
||||
{
|
||||
pupa_uint8_t length;
|
||||
pupa_uint8_t reserved;
|
||||
pupa_uint16_t blocks;
|
||||
pupa_uint32_t buffer;
|
||||
pupa_uint64_t block;
|
||||
grub_uint8_t length;
|
||||
grub_uint8_t reserved;
|
||||
grub_uint16_t blocks;
|
||||
grub_uint32_t buffer;
|
||||
grub_uint64_t block;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
|
||||
static int
|
||||
pupa_biosdisk_get_drive (const char *name)
|
||||
grub_biosdisk_get_drive (const char *name)
|
||||
{
|
||||
unsigned long drive;
|
||||
|
||||
if ((name[0] != 'f' && name[0] != 'h') || name[1] != 'd')
|
||||
goto fail;
|
||||
|
||||
drive = pupa_strtoul (name + 2, 0, 10);
|
||||
if (pupa_errno != PUPA_ERR_NONE)
|
||||
drive = grub_strtoul (name + 2, 0, 10);
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
goto fail;
|
||||
|
||||
if (name[0] == 'h')
|
||||
|
|
@ -84,62 +84,62 @@ pupa_biosdisk_get_drive (const char *name)
|
|||
return (int) drive ;
|
||||
|
||||
fail:
|
||||
pupa_error (PUPA_ERR_UNKNOWN_DEVICE, "not a biosdisk");
|
||||
grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a biosdisk");
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int
|
||||
pupa_biosdisk_call_hook (int (*hook) (const char *name), int drive)
|
||||
grub_biosdisk_call_hook (int (*hook) (const char *name), int drive)
|
||||
{
|
||||
char name[10];
|
||||
|
||||
pupa_sprintf (name, (drive & 0x80) ? "hd%d" : "fd%d", drive & (~0x80));
|
||||
grub_sprintf (name, (drive & 0x80) ? "hd%d" : "fd%d", drive & (~0x80));
|
||||
return hook (name);
|
||||
}
|
||||
|
||||
static int
|
||||
pupa_biosdisk_iterate (int (*hook) (const char *name))
|
||||
grub_biosdisk_iterate (int (*hook) (const char *name))
|
||||
{
|
||||
int drive;
|
||||
int num_floppies;
|
||||
|
||||
/* For floppy disks, we can get the number safely. */
|
||||
num_floppies = pupa_biosdisk_get_num_floppies ();
|
||||
num_floppies = grub_biosdisk_get_num_floppies ();
|
||||
for (drive = 0; drive < num_floppies; drive++)
|
||||
if (pupa_biosdisk_call_hook (hook, drive))
|
||||
if (grub_biosdisk_call_hook (hook, drive))
|
||||
return 1;
|
||||
|
||||
/* For hard disks, attempt to read the MBR. */
|
||||
for (drive = 0x80; drive < 0x90; drive++)
|
||||
{
|
||||
if (pupa_biosdisk_rw_standard (0x02, drive, 0, 0, 1, 1,
|
||||
PUPA_MEMORY_MACHINE_SCRATCH_SEG) != 0)
|
||||
if (grub_biosdisk_rw_standard (0x02, drive, 0, 0, 1, 1,
|
||||
GRUB_MEMORY_MACHINE_SCRATCH_SEG) != 0)
|
||||
break;
|
||||
|
||||
if (pupa_biosdisk_call_hook (hook, drive))
|
||||
if (grub_biosdisk_call_hook (hook, drive))
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_biosdisk_open (const char *name, pupa_disk_t disk)
|
||||
static grub_err_t
|
||||
grub_biosdisk_open (const char *name, grub_disk_t disk)
|
||||
{
|
||||
unsigned long total_sectors = 0;
|
||||
int drive;
|
||||
struct pupa_biosdisk_data *data;
|
||||
struct grub_biosdisk_data *data;
|
||||
|
||||
drive = pupa_biosdisk_get_drive (name);
|
||||
drive = grub_biosdisk_get_drive (name);
|
||||
if (drive < 0)
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
|
||||
disk->has_partitions = (drive & 0x80);
|
||||
disk->id = drive;
|
||||
|
||||
data = (struct pupa_biosdisk_data *) pupa_malloc (sizeof (*data));
|
||||
data = (struct grub_biosdisk_data *) grub_malloc (sizeof (*data));
|
||||
if (! data)
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
|
||||
data->drive = drive;
|
||||
data->flags = 0;
|
||||
|
|
@ -149,18 +149,18 @@ pupa_biosdisk_open (const char *name, pupa_disk_t disk)
|
|||
/* HDD */
|
||||
int version;
|
||||
|
||||
version = pupa_biosdisk_check_int13_extensions (drive);
|
||||
version = grub_biosdisk_check_int13_extensions (drive);
|
||||
if (version)
|
||||
{
|
||||
struct pupa_biosdisk_drp *drp
|
||||
= (struct pupa_biosdisk_drp *) PUPA_MEMORY_MACHINE_SCRATCH_ADDR;
|
||||
struct grub_biosdisk_drp *drp
|
||||
= (struct grub_biosdisk_drp *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
|
||||
|
||||
/* Clear out the DRP. */
|
||||
pupa_memset (drp, 0, sizeof (*drp));
|
||||
grub_memset (drp, 0, sizeof (*drp));
|
||||
drp->size = sizeof (*drp);
|
||||
if (!pupa_biosdisk_get_diskinfo_int13_extensions (drive, drp))
|
||||
if (!grub_biosdisk_get_diskinfo_int13_extensions (drive, drp))
|
||||
{
|
||||
data->flags = PUPA_BIOSDISK_FLAG_LBA;
|
||||
data->flags = GRUB_BIOSDISK_FLAG_LBA;
|
||||
|
||||
/* FIXME: 2TB limit. */
|
||||
if (drp->total_sectors)
|
||||
|
|
@ -174,13 +174,13 @@ pupa_biosdisk_open (const char *name, pupa_disk_t disk)
|
|||
}
|
||||
}
|
||||
|
||||
if (pupa_biosdisk_get_diskinfo_standard (drive,
|
||||
if (grub_biosdisk_get_diskinfo_standard (drive,
|
||||
&data->cylinders,
|
||||
&data->heads,
|
||||
&data->sectors) != 0)
|
||||
{
|
||||
pupa_free (data);
|
||||
return pupa_error (PUPA_ERR_BAD_DEVICE, "cannot get C/H/S values");
|
||||
grub_free (data);
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "cannot get C/H/S values");
|
||||
}
|
||||
|
||||
if (! total_sectors)
|
||||
|
|
@ -189,45 +189,45 @@ pupa_biosdisk_open (const char *name, pupa_disk_t disk)
|
|||
disk->total_sectors = total_sectors;
|
||||
disk->data = data;
|
||||
|
||||
return PUPA_ERR_NONE;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static void
|
||||
pupa_biosdisk_close (pupa_disk_t disk)
|
||||
grub_biosdisk_close (grub_disk_t disk)
|
||||
{
|
||||
pupa_free (disk->data);
|
||||
grub_free (disk->data);
|
||||
}
|
||||
|
||||
/* For readability. */
|
||||
#define PUPA_BIOSDISK_READ 0
|
||||
#define PUPA_BIOSDISK_WRITE 1
|
||||
#define GRUB_BIOSDISK_READ 0
|
||||
#define GRUB_BIOSDISK_WRITE 1
|
||||
|
||||
static pupa_err_t
|
||||
pupa_biosdisk_rw (int cmd, pupa_disk_t disk,
|
||||
static grub_err_t
|
||||
grub_biosdisk_rw (int cmd, grub_disk_t disk,
|
||||
unsigned long sector, unsigned long size,
|
||||
unsigned segment)
|
||||
{
|
||||
struct pupa_biosdisk_data *data = disk->data;
|
||||
struct grub_biosdisk_data *data = disk->data;
|
||||
|
||||
if (data->flags & PUPA_BIOSDISK_FLAG_LBA)
|
||||
if (data->flags & GRUB_BIOSDISK_FLAG_LBA)
|
||||
{
|
||||
struct pupa_biosdisk_dap *dap;
|
||||
struct grub_biosdisk_dap *dap;
|
||||
|
||||
dap = (struct pupa_biosdisk_dap *) (PUPA_MEMORY_MACHINE_SCRATCH_ADDR
|
||||
dap = (struct grub_biosdisk_dap *) (GRUB_MEMORY_MACHINE_SCRATCH_ADDR
|
||||
+ (data->sectors
|
||||
<< PUPA_DISK_SECTOR_BITS));
|
||||
<< GRUB_DISK_SECTOR_BITS));
|
||||
dap->length = sizeof (*dap);
|
||||
dap->reserved = 0;
|
||||
dap->blocks = size;
|
||||
dap->buffer = segment << 16; /* The format SEGMENT:ADDRESS. */
|
||||
dap->block = sector;
|
||||
|
||||
if (pupa_biosdisk_rw_int13_extensions (cmd + 0x42, data->drive, dap))
|
||||
if (grub_biosdisk_rw_int13_extensions (cmd + 0x42, data->drive, dap))
|
||||
{
|
||||
/* Fall back to the CHS mode. */
|
||||
data->flags &= ~PUPA_BIOSDISK_FLAG_LBA;
|
||||
data->flags &= ~GRUB_BIOSDISK_FLAG_LBA;
|
||||
disk->total_sectors = data->cylinders * data->heads * data->sectors;
|
||||
return pupa_biosdisk_rw (cmd, disk, sector, size, segment);
|
||||
return grub_biosdisk_rw (cmd, disk, sector, size, segment);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -241,29 +241,29 @@ pupa_biosdisk_rw (int cmd, pupa_disk_t disk,
|
|||
coff = head / data->heads;
|
||||
|
||||
if (coff >= data->cylinders)
|
||||
return pupa_error (PUPA_ERR_OUT_OF_RANGE, "out of disk");
|
||||
return grub_error (GRUB_ERR_OUT_OF_RANGE, "out of disk");
|
||||
|
||||
if (pupa_biosdisk_rw_standard (cmd + 0x02, data->drive,
|
||||
if (grub_biosdisk_rw_standard (cmd + 0x02, data->drive,
|
||||
coff, hoff, soff, size, segment))
|
||||
{
|
||||
switch (cmd)
|
||||
{
|
||||
case PUPA_BIOSDISK_READ:
|
||||
return pupa_error (PUPA_ERR_READ_ERROR, "biosdisk read error");
|
||||
case PUPA_BIOSDISK_WRITE:
|
||||
return pupa_error (PUPA_ERR_WRITE_ERROR, "biosdisk write error");
|
||||
case GRUB_BIOSDISK_READ:
|
||||
return grub_error (GRUB_ERR_READ_ERROR, "biosdisk read error");
|
||||
case GRUB_BIOSDISK_WRITE:
|
||||
return grub_error (GRUB_ERR_WRITE_ERROR, "biosdisk write error");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return PUPA_ERR_NONE;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_biosdisk_read (pupa_disk_t disk, unsigned long sector,
|
||||
static grub_err_t
|
||||
grub_biosdisk_read (grub_disk_t disk, unsigned long sector,
|
||||
unsigned long size, char *buf)
|
||||
{
|
||||
struct pupa_biosdisk_data *data = disk->data;
|
||||
struct grub_biosdisk_data *data = disk->data;
|
||||
|
||||
while (size)
|
||||
{
|
||||
|
|
@ -273,25 +273,25 @@ pupa_biosdisk_read (pupa_disk_t disk, unsigned long sector,
|
|||
if (len > size)
|
||||
len = size;
|
||||
|
||||
if (pupa_biosdisk_rw (PUPA_BIOSDISK_READ, disk, sector, len,
|
||||
PUPA_MEMORY_MACHINE_SCRATCH_SEG))
|
||||
return pupa_errno;
|
||||
if (grub_biosdisk_rw (GRUB_BIOSDISK_READ, disk, sector, len,
|
||||
GRUB_MEMORY_MACHINE_SCRATCH_SEG))
|
||||
return grub_errno;
|
||||
|
||||
pupa_memcpy (buf, (void *) PUPA_MEMORY_MACHINE_SCRATCH_ADDR,
|
||||
len << PUPA_DISK_SECTOR_BITS);
|
||||
buf += len << PUPA_DISK_SECTOR_BITS;
|
||||
grub_memcpy (buf, (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR,
|
||||
len << GRUB_DISK_SECTOR_BITS);
|
||||
buf += len << GRUB_DISK_SECTOR_BITS;
|
||||
sector += len;
|
||||
size -= len;
|
||||
}
|
||||
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_biosdisk_write (pupa_disk_t disk, unsigned long sector,
|
||||
static grub_err_t
|
||||
grub_biosdisk_write (grub_disk_t disk, unsigned long sector,
|
||||
unsigned long size, const char *buf)
|
||||
{
|
||||
struct pupa_biosdisk_data *data = disk->data;
|
||||
struct grub_biosdisk_data *data = disk->data;
|
||||
|
||||
while (size)
|
||||
{
|
||||
|
|
@ -301,34 +301,34 @@ pupa_biosdisk_write (pupa_disk_t disk, unsigned long sector,
|
|||
if (len > size)
|
||||
len = size;
|
||||
|
||||
pupa_memcpy ((void *) PUPA_MEMORY_MACHINE_SCRATCH_ADDR, buf,
|
||||
len << PUPA_DISK_SECTOR_BITS);
|
||||
grub_memcpy ((void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR, buf,
|
||||
len << GRUB_DISK_SECTOR_BITS);
|
||||
|
||||
if (pupa_biosdisk_rw (PUPA_BIOSDISK_WRITE, disk, sector, len,
|
||||
PUPA_MEMORY_MACHINE_SCRATCH_SEG))
|
||||
return pupa_errno;
|
||||
if (grub_biosdisk_rw (GRUB_BIOSDISK_WRITE, disk, sector, len,
|
||||
GRUB_MEMORY_MACHINE_SCRATCH_SEG))
|
||||
return grub_errno;
|
||||
|
||||
buf += len << PUPA_DISK_SECTOR_BITS;
|
||||
buf += len << GRUB_DISK_SECTOR_BITS;
|
||||
sector += len;
|
||||
size -= len;
|
||||
}
|
||||
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
static struct pupa_disk_dev pupa_biosdisk_dev =
|
||||
static struct grub_disk_dev grub_biosdisk_dev =
|
||||
{
|
||||
.name = "biosdisk",
|
||||
.iterate = pupa_biosdisk_iterate,
|
||||
.open = pupa_biosdisk_open,
|
||||
.close = pupa_biosdisk_close,
|
||||
.read = pupa_biosdisk_read,
|
||||
.write = pupa_biosdisk_write,
|
||||
.iterate = grub_biosdisk_iterate,
|
||||
.open = grub_biosdisk_open,
|
||||
.close = grub_biosdisk_close,
|
||||
.read = grub_biosdisk_read,
|
||||
.write = grub_biosdisk_write,
|
||||
.next = 0
|
||||
};
|
||||
|
||||
void
|
||||
pupa_biosdisk_init (void)
|
||||
grub_biosdisk_init (void)
|
||||
{
|
||||
pupa_disk_dev_register (&pupa_biosdisk_dev);
|
||||
grub_disk_dev_register (&grub_biosdisk_dev);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
*
|
||||
* PUPA is free software; you can redistribute it and/or modify
|
||||
* GRUB 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.
|
||||
|
|
@ -13,23 +13,23 @@
|
|||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with PUPA; if not, write to the Free Software
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/machine/partition.h>
|
||||
#include <pupa/disk.h>
|
||||
#include <pupa/mm.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <grub/machine/partition.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/misc.h>
|
||||
|
||||
/* Parse the partition representation in STR and return a partition. */
|
||||
static pupa_partition_t
|
||||
pupa_partition_parse (const char *str)
|
||||
static grub_partition_t
|
||||
grub_partition_parse (const char *str)
|
||||
{
|
||||
pupa_partition_t p;
|
||||
grub_partition_t p;
|
||||
char *s = (char *) str;
|
||||
|
||||
p = (pupa_partition_t) pupa_malloc (sizeof (*p));
|
||||
p = (grub_partition_t) grub_malloc (sizeof (*p));
|
||||
if (! p)
|
||||
return 0;
|
||||
|
||||
|
|
@ -37,13 +37,13 @@ pupa_partition_parse (const char *str)
|
|||
p->bsd_part = p->dos_type = p->bsd_type = p->index = -1;
|
||||
|
||||
/* Get the DOS partition number. */
|
||||
p->dos_part = pupa_strtoul (s, &s, 0);
|
||||
p->dos_part = grub_strtoul (s, &s, 0);
|
||||
|
||||
if (pupa_errno)
|
||||
if (grub_errno)
|
||||
{
|
||||
/* Not found. Maybe only a BSD label is specified. */
|
||||
p->dos_part = -1;
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
}
|
||||
else if (*s == ',')
|
||||
s++;
|
||||
|
|
@ -66,19 +66,19 @@ pupa_partition_parse (const char *str)
|
|||
return p;
|
||||
|
||||
fail:
|
||||
pupa_free (p);
|
||||
pupa_error (PUPA_ERR_BAD_FILENAME, "invalid partition");
|
||||
grub_free (p);
|
||||
grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
|
||||
return 0;
|
||||
}
|
||||
|
||||
pupa_err_t
|
||||
pupa_partition_iterate (pupa_disk_t disk,
|
||||
int (*hook) (const pupa_partition_t partition))
|
||||
grub_err_t
|
||||
grub_partition_iterate (grub_disk_t disk,
|
||||
int (*hook) (const grub_partition_t partition))
|
||||
{
|
||||
struct pupa_partition p;
|
||||
struct pupa_partition_mbr mbr;
|
||||
struct pupa_partition_disk_label label;
|
||||
struct pupa_disk raw;
|
||||
struct grub_partition p;
|
||||
struct grub_partition_mbr mbr;
|
||||
struct grub_partition_disk_label label;
|
||||
struct grub_disk raw;
|
||||
|
||||
/* Enforce raw disk access. */
|
||||
raw = *disk;
|
||||
|
|
@ -91,30 +91,30 @@ pupa_partition_iterate (pupa_disk_t disk,
|
|||
while (1)
|
||||
{
|
||||
int i;
|
||||
struct pupa_partition_entry *e;
|
||||
struct grub_partition_entry *e;
|
||||
|
||||
/* Read the MBR. */
|
||||
if (pupa_disk_read (&raw, p.offset, 0, sizeof (mbr), (char *) &mbr))
|
||||
if (grub_disk_read (&raw, p.offset, 0, sizeof (mbr), (char *) &mbr))
|
||||
goto finish;
|
||||
|
||||
/* Check if it is valid. */
|
||||
if (mbr.signature != pupa_cpu_to_le16 (PUPA_PARTITION_SIGNATURE))
|
||||
return pupa_error (PUPA_ERR_BAD_PART_TABLE, "no signature");
|
||||
if (mbr.signature != grub_cpu_to_le16 (GRUB_PARTITION_SIGNATURE))
|
||||
return grub_error (GRUB_ERR_BAD_PART_TABLE, "no signature");
|
||||
|
||||
/* Analyze DOS partitions. */
|
||||
for (p.index = 0; p.index < 4; p.index++)
|
||||
{
|
||||
e = mbr.entries + p.index;
|
||||
|
||||
p.start = p.offset + pupa_le_to_cpu32 (e->start);
|
||||
p.len = pupa_le_to_cpu32 (e->length);
|
||||
p.start = p.offset + grub_le_to_cpu32 (e->start);
|
||||
p.len = grub_le_to_cpu32 (e->length);
|
||||
p.bsd_part = -1;
|
||||
p.dos_type = e->type;
|
||||
p.bsd_type = -1;
|
||||
|
||||
/* If this partition is a normal one, call the hook. */
|
||||
if (! pupa_partition_is_empty (e->type)
|
||||
&& ! pupa_partition_is_extended (e->type))
|
||||
if (! grub_partition_is_empty (e->type)
|
||||
&& ! grub_partition_is_extended (e->type))
|
||||
{
|
||||
p.dos_part++;
|
||||
|
||||
|
|
@ -122,17 +122,17 @@ pupa_partition_iterate (pupa_disk_t disk,
|
|||
goto finish;
|
||||
|
||||
/* Check if this is a BSD partition. */
|
||||
if (pupa_partition_is_bsd (e->type))
|
||||
if (grub_partition_is_bsd (e->type))
|
||||
{
|
||||
/* Check if the BSD label is within the DOS partition. */
|
||||
if (p.len <= PUPA_PARTITION_BSD_LABEL_SECTOR)
|
||||
return pupa_error (PUPA_ERR_BAD_PART_TABLE,
|
||||
if (p.len <= GRUB_PARTITION_BSD_LABEL_SECTOR)
|
||||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||||
"no space for disk label");
|
||||
|
||||
/* Read the BSD label. */
|
||||
if (pupa_disk_read (&raw,
|
||||
if (grub_disk_read (&raw,
|
||||
(p.start
|
||||
+ PUPA_PARTITION_BSD_LABEL_SECTOR),
|
||||
+ GRUB_PARTITION_BSD_LABEL_SECTOR),
|
||||
0,
|
||||
sizeof (label),
|
||||
(char *) &label))
|
||||
|
|
@ -140,22 +140,22 @@ pupa_partition_iterate (pupa_disk_t disk,
|
|||
|
||||
/* Check if it is valid. */
|
||||
if (label.magic
|
||||
!= pupa_cpu_to_le32 (PUPA_PARTITION_BSD_LABEL_MAGIC))
|
||||
return pupa_error (PUPA_ERR_BAD_PART_TABLE,
|
||||
!= grub_cpu_to_le32 (GRUB_PARTITION_BSD_LABEL_MAGIC))
|
||||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||||
"invalid disk label magic");
|
||||
|
||||
for (p.bsd_part = 0;
|
||||
p.bsd_part < pupa_cpu_to_le16 (label.num_partitions);
|
||||
p.bsd_part < grub_cpu_to_le16 (label.num_partitions);
|
||||
p.bsd_part++)
|
||||
{
|
||||
struct pupa_partition_bsd_entry *be
|
||||
struct grub_partition_bsd_entry *be
|
||||
= label.entries + p.bsd_part;
|
||||
|
||||
p.start = pupa_le_to_cpu32 (be->offset);
|
||||
p.len = pupa_le_to_cpu32 (be->size);
|
||||
p.start = grub_le_to_cpu32 (be->offset);
|
||||
p.len = grub_le_to_cpu32 (be->size);
|
||||
p.bsd_type = be->fs_type;
|
||||
|
||||
if (be->fs_type != PUPA_PARTITION_BSD_TYPE_UNUSED)
|
||||
if (be->fs_type != GRUB_PARTITION_BSD_TYPE_UNUSED)
|
||||
if (hook (&p))
|
||||
goto finish;
|
||||
}
|
||||
|
|
@ -172,9 +172,9 @@ pupa_partition_iterate (pupa_disk_t disk,
|
|||
{
|
||||
e = mbr.entries + i;
|
||||
|
||||
if (pupa_partition_is_extended (e->type))
|
||||
if (grub_partition_is_extended (e->type))
|
||||
{
|
||||
p.offset = p.ext_offset + pupa_le_to_cpu32 (e->start);
|
||||
p.offset = p.ext_offset + grub_le_to_cpu32 (e->start);
|
||||
if (! p.ext_offset)
|
||||
p.ext_offset = p.offset;
|
||||
|
||||
|
|
@ -188,61 +188,61 @@ pupa_partition_iterate (pupa_disk_t disk,
|
|||
}
|
||||
|
||||
finish:
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
pupa_partition_t
|
||||
pupa_partition_probe (pupa_disk_t disk, const char *str)
|
||||
grub_partition_t
|
||||
grub_partition_probe (grub_disk_t disk, const char *str)
|
||||
{
|
||||
pupa_partition_t p;
|
||||
auto int find_func (const pupa_partition_t partition);
|
||||
grub_partition_t p;
|
||||
auto int find_func (const grub_partition_t partition);
|
||||
|
||||
int find_func (const pupa_partition_t partition)
|
||||
int find_func (const grub_partition_t partition)
|
||||
{
|
||||
if ((p->dos_part == partition->dos_part || p->dos_part == -1)
|
||||
&& p->bsd_part == partition->bsd_part)
|
||||
{
|
||||
pupa_memcpy (p, partition, sizeof (*p));
|
||||
grub_memcpy (p, partition, sizeof (*p));
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
p = pupa_partition_parse (str);
|
||||
p = grub_partition_parse (str);
|
||||
if (! p)
|
||||
return 0;
|
||||
|
||||
|
||||
if (pupa_partition_iterate (disk, find_func))
|
||||
if (grub_partition_iterate (disk, find_func))
|
||||
goto fail;
|
||||
|
||||
if (p->index < 0)
|
||||
{
|
||||
pupa_error (PUPA_ERR_BAD_DEVICE, "no such partition");
|
||||
grub_error (GRUB_ERR_BAD_DEVICE, "no such partition");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
return p;
|
||||
|
||||
fail:
|
||||
pupa_free (p);
|
||||
grub_free (p);
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *
|
||||
pupa_partition_get_name (const pupa_partition_t p)
|
||||
grub_partition_get_name (const grub_partition_t p)
|
||||
{
|
||||
char *name;
|
||||
|
||||
name = pupa_malloc (13);
|
||||
name = grub_malloc (13);
|
||||
if (! name)
|
||||
return 0;
|
||||
|
||||
if (p->bsd_part < 0)
|
||||
pupa_sprintf (name, "%d", p->dos_part);
|
||||
grub_sprintf (name, "%d", p->dos_part);
|
||||
else
|
||||
pupa_sprintf (name, "%d,%c", p->dos_part, p->bsd_part + 'a');
|
||||
grub_sprintf (name, "%d,%c", p->dos_part, p->bsd_part + 'a');
|
||||
|
||||
return name;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* ofdisk.c - Open Firmware disk access. */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -18,70 +18,70 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/disk.h>
|
||||
#include <pupa/mm.h>
|
||||
#include <pupa/machine/ieee1275.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/machine/ieee1275.h>
|
||||
|
||||
static int
|
||||
pupa_ofdisk_iterate (int (*hook) (const char *name))
|
||||
grub_ofdisk_iterate (int (*hook) (const char *name))
|
||||
{
|
||||
int dev_iterate (struct pupa_ieee1275_devalias *alias)
|
||||
int dev_iterate (struct grub_ieee1275_devalias *alias)
|
||||
{
|
||||
if (! pupa_strcmp (alias->type, "block"))
|
||||
if (! grub_strcmp (alias->type, "block"))
|
||||
hook (alias->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
pupa_devalias_iterate (dev_iterate);
|
||||
grub_devalias_iterate (dev_iterate);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ofdisk_open (const char *name, pupa_disk_t disk)
|
||||
static grub_err_t
|
||||
grub_ofdisk_open (const char *name, grub_disk_t disk)
|
||||
{
|
||||
pupa_ieee1275_phandle_t devalias;
|
||||
pupa_ieee1275_phandle_t dev;
|
||||
pupa_ieee1275_ihandle_t dev_ihandle = 0;
|
||||
grub_ieee1275_phandle_t devalias;
|
||||
grub_ieee1275_phandle_t dev;
|
||||
grub_ieee1275_ihandle_t dev_ihandle = 0;
|
||||
char *devpath = 0;
|
||||
/* XXX: This should be large enough for any possible case. */
|
||||
char prop[64];
|
||||
pupa_size_t pathlen;
|
||||
grub_size_t pathlen;
|
||||
int actual;
|
||||
|
||||
if (pupa_ieee1275_finddevice ("/aliases", &devalias))
|
||||
return pupa_error (PUPA_ERR_UNKNOWN_DEVICE, "Can't read the aliases");
|
||||
if (grub_ieee1275_finddevice ("/aliases", &devalias))
|
||||
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Can't read the aliases");
|
||||
|
||||
pupa_ieee1275_get_property_length (devalias, name, &pathlen);
|
||||
devpath = pupa_malloc (pathlen);
|
||||
grub_ieee1275_get_property_length (devalias, name, &pathlen);
|
||||
devpath = grub_malloc (pathlen);
|
||||
if (! devpath)
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
|
||||
if (pupa_ieee1275_get_property (devalias, name, devpath, pathlen, &actual))
|
||||
return pupa_error (PUPA_ERR_UNKNOWN_DEVICE, "No such device alias");
|
||||
if (grub_ieee1275_get_property (devalias, name, devpath, pathlen, &actual))
|
||||
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "No such device alias");
|
||||
|
||||
/* To access the complete disk add `:0'. */
|
||||
pupa_strcat (devpath, ":0");
|
||||
pupa_ieee1275_open (devpath, &dev_ihandle);
|
||||
grub_strcat (devpath, ":0");
|
||||
grub_ieee1275_open (devpath, &dev_ihandle);
|
||||
if (! dev_ihandle)
|
||||
return pupa_error (PUPA_ERR_UNKNOWN_DEVICE, "Can't open device");
|
||||
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Can't open device");
|
||||
|
||||
if (pupa_ieee1275_finddevice (devpath, &dev))
|
||||
if (grub_ieee1275_finddevice (devpath, &dev))
|
||||
{
|
||||
pupa_error (PUPA_ERR_UNKNOWN_DEVICE, "Can't read device properties");
|
||||
grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Can't read device properties");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (pupa_ieee1275_get_property (dev, "device_type", prop, sizeof (prop),
|
||||
if (grub_ieee1275_get_property (dev, "device_type", prop, sizeof (prop),
|
||||
&actual))
|
||||
{
|
||||
pupa_error (PUPA_ERR_BAD_DEVICE, "Can't read the device type");
|
||||
grub_error (GRUB_ERR_BAD_DEVICE, "Can't read the device type");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (pupa_strcmp (prop, "block"))
|
||||
if (grub_strcmp (prop, "block"))
|
||||
{
|
||||
pupa_error (PUPA_ERR_BAD_DEVICE, "Not a block device");
|
||||
grub_error (GRUB_ERR_BAD_DEVICE, "Not a block device");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
|
@ -99,20 +99,20 @@ pupa_ofdisk_open (const char *name, pupa_disk_t disk)
|
|||
disk->data = (void *) dev_ihandle;
|
||||
|
||||
fail:
|
||||
if (pupa_errno)
|
||||
pupa_ieee1275_close (dev_ihandle);
|
||||
pupa_free (devpath);
|
||||
return pupa_errno;
|
||||
if (grub_errno)
|
||||
grub_ieee1275_close (dev_ihandle);
|
||||
grub_free (devpath);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
static void
|
||||
pupa_ofdisk_close (pupa_disk_t disk)
|
||||
grub_ofdisk_close (grub_disk_t disk)
|
||||
{
|
||||
pupa_ieee1275_close ((pupa_ieee1275_ihandle_t) disk->data);
|
||||
grub_ieee1275_close ((grub_ieee1275_ihandle_t) disk->data);
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ofdisk_read (pupa_disk_t disk, unsigned long sector,
|
||||
static grub_err_t
|
||||
grub_ofdisk_read (grub_disk_t disk, unsigned long sector,
|
||||
unsigned long size, char *buf)
|
||||
{
|
||||
int status;
|
||||
|
|
@ -121,41 +121,41 @@ pupa_ofdisk_read (pupa_disk_t disk, unsigned long sector,
|
|||
|
||||
pos = (unsigned long long) sector * 512UL;
|
||||
|
||||
pupa_ieee1275_seek ((pupa_ieee1275_ihandle_t) disk->data, (int) (pos >> 32),
|
||||
grub_ieee1275_seek ((grub_ieee1275_ihandle_t) disk->data, (int) (pos >> 32),
|
||||
(int) pos & 0xFFFFFFFFUL, &status);
|
||||
if (status != 0)
|
||||
return pupa_error (PUPA_ERR_READ_ERROR,
|
||||
return grub_error (GRUB_ERR_READ_ERROR,
|
||||
"Seek error, can't seek block %d", sector);
|
||||
pupa_ieee1275_read ((pupa_ieee1275_ihandle_t) disk->data, buf,
|
||||
grub_ieee1275_read ((grub_ieee1275_ihandle_t) disk->data, buf,
|
||||
size * 512UL, &actual);
|
||||
if (actual != actual)
|
||||
return pupa_error (PUPA_ERR_READ_ERROR, "Read error on block: %d", sector);
|
||||
return grub_error (GRUB_ERR_READ_ERROR, "Read error on block: %d", sector);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ofdisk_write (pupa_disk_t disk __attribute ((unused)),
|
||||
static grub_err_t
|
||||
grub_ofdisk_write (grub_disk_t disk __attribute ((unused)),
|
||||
unsigned long sector __attribute ((unused)),
|
||||
unsigned long size __attribute ((unused)),
|
||||
const char *buf __attribute ((unused)))
|
||||
{
|
||||
return PUPA_ERR_NOT_IMPLEMENTED_YET;
|
||||
return GRUB_ERR_NOT_IMPLEMENTED_YET;
|
||||
}
|
||||
|
||||
static struct pupa_disk_dev pupa_ofdisk_dev =
|
||||
static struct grub_disk_dev grub_ofdisk_dev =
|
||||
{
|
||||
.name = "ofdisk",
|
||||
.iterate = pupa_ofdisk_iterate,
|
||||
.open = pupa_ofdisk_open,
|
||||
.close = pupa_ofdisk_close,
|
||||
.read = pupa_ofdisk_read,
|
||||
.write = pupa_ofdisk_write,
|
||||
.iterate = grub_ofdisk_iterate,
|
||||
.open = grub_ofdisk_open,
|
||||
.close = grub_ofdisk_close,
|
||||
.read = grub_ofdisk_read,
|
||||
.write = grub_ofdisk_write,
|
||||
.next = 0
|
||||
};
|
||||
|
||||
void
|
||||
pupa_ofdisk_init (void)
|
||||
grub_ofdisk_init (void)
|
||||
{
|
||||
pupa_disk_dev_register (&pupa_ofdisk_dev);
|
||||
grub_disk_dev_register (&grub_ofdisk_dev);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* partiton.c - Read macintosh partition tables. */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -18,20 +18,20 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/disk.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/mm.h>
|
||||
#include <pupa/machine/partition.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/machine/partition.h>
|
||||
|
||||
pupa_err_t
|
||||
pupa_partition_iterate (pupa_disk_t disk,
|
||||
int (*hook) (const pupa_partition_t partition))
|
||||
grub_err_t
|
||||
grub_partition_iterate (grub_disk_t disk,
|
||||
int (*hook) (const grub_partition_t partition))
|
||||
{
|
||||
struct pupa_partition part;
|
||||
struct pupa_apple_part apart;
|
||||
struct pupa_disk raw;
|
||||
struct grub_partition part;
|
||||
struct grub_apple_part apart;
|
||||
struct grub_disk raw;
|
||||
int partno = 0;
|
||||
int pos = PUPA_DISK_SECTOR_SIZE * 2;
|
||||
int pos = GRUB_DISK_SECTOR_SIZE * 2;
|
||||
|
||||
/* Enforce raw disk access. */
|
||||
raw = *disk;
|
||||
|
|
@ -39,12 +39,12 @@ pupa_partition_iterate (pupa_disk_t disk,
|
|||
|
||||
for (;;)
|
||||
{
|
||||
if (pupa_disk_read (&raw, pos / PUPA_DISK_SECTOR_SIZE,
|
||||
pos % PUPA_DISK_SECTOR_SIZE,
|
||||
sizeof (struct pupa_apple_part), (char *) &apart))
|
||||
return pupa_errno;
|
||||
if (grub_disk_read (&raw, pos / GRUB_DISK_SECTOR_SIZE,
|
||||
pos % GRUB_DISK_SECTOR_SIZE,
|
||||
sizeof (struct grub_apple_part), (char *) &apart))
|
||||
return grub_errno;
|
||||
|
||||
if (apart.magic != PUPA_APPLE_PART_MAGIC)
|
||||
if (apart.magic != GRUB_APPLE_PART_MAGIC)
|
||||
break;
|
||||
|
||||
part.start = apart.first_phys_block;
|
||||
|
|
@ -53,34 +53,34 @@ pupa_partition_iterate (pupa_disk_t disk,
|
|||
part.index = partno;
|
||||
|
||||
if (hook (&part))
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
|
||||
if (apart.first_phys_block == PUPA_DISK_SECTOR_SIZE * 2)
|
||||
if (apart.first_phys_block == GRUB_DISK_SECTOR_SIZE * 2)
|
||||
return 0;
|
||||
|
||||
pos += sizeof (struct pupa_apple_part);
|
||||
pos += sizeof (struct grub_apple_part);
|
||||
partno++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
pupa_partition_t
|
||||
pupa_partition_probe (pupa_disk_t disk, const char *str)
|
||||
grub_partition_t
|
||||
grub_partition_probe (grub_disk_t disk, const char *str)
|
||||
{
|
||||
pupa_partition_t p;
|
||||
grub_partition_t p;
|
||||
int partnum = 0;
|
||||
char *s = (char *) str;
|
||||
|
||||
int find_func (const pupa_partition_t partition)
|
||||
int find_func (const grub_partition_t partition)
|
||||
{
|
||||
if (partnum == partition->index)
|
||||
{
|
||||
p = (pupa_partition_t) pupa_malloc (sizeof (*p));
|
||||
p = (grub_partition_t) grub_malloc (sizeof (*p));
|
||||
if (! p)
|
||||
return 1;
|
||||
|
||||
pupa_memcpy (p, partition, sizeof (*p));
|
||||
grub_memcpy (p, partition, sizeof (*p));
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -88,33 +88,33 @@ pupa_partition_probe (pupa_disk_t disk, const char *str)
|
|||
}
|
||||
|
||||
/* Get the partition number. */
|
||||
partnum = pupa_strtoul (s, &s, 0);
|
||||
if (pupa_errno)
|
||||
partnum = grub_strtoul (s, &s, 0);
|
||||
if (grub_errno)
|
||||
{
|
||||
pupa_error (PUPA_ERR_BAD_FILENAME, "invalid partition");
|
||||
grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (pupa_partition_iterate (disk, find_func))
|
||||
if (grub_partition_iterate (disk, find_func))
|
||||
goto fail;
|
||||
|
||||
return p;
|
||||
|
||||
fail:
|
||||
pupa_free (p);
|
||||
grub_free (p);
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
char *
|
||||
pupa_partition_get_name (const pupa_partition_t p)
|
||||
grub_partition_get_name (const grub_partition_t p)
|
||||
{
|
||||
char *name;
|
||||
|
||||
name = pupa_malloc (13);
|
||||
name = grub_malloc (13);
|
||||
if (! name)
|
||||
return 0;
|
||||
|
||||
pupa_sprintf (name, "%d", p->index);
|
||||
grub_sprintf (name, "%d", p->index);
|
||||
return name;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue