hal/volume_id Makefile.am, 1.8, 1.9 cramfs.c, 1.5, 1.6 cramfs.h, 1.3,
NONE ext.c, 1.6, 1.7 ext.h, 1.3, NONE fat.c, 1.8, 1.9 fat.h,
1.3, NONE hfs.c, 1.6, 1.7 hfs.h, 1.3, NONE highpoint.c, 1.7,
1.8 highpoint.h, 1.4, NONE hpfs.c, 1.5, 1.6 hpfs.h, 1.3,
NONE iso9660.c, 1.7, 1.8 iso9660.h, 1.3, NONE isw_raid.c, 1.5,
1.6 isw_raid.h, 1.3, NONE jfs.c, 1.6, 1.7 jfs.h, 1.3,
NONE linux_raid.c, 1.7, 1.8 linux_raid.h, 1.3,
NONE linux_swap.c, 1.6, 1.7 linux_swap.h, 1.3, NONE lsi_raid.c,
1.4, 1.5 lsi_raid.h, 1.3, NONE luks.c, 1.7, 1.8 luks.h, 1.4,
NONE lvm.c, 1.7, 1.8 lvm.h, 1.3, NONE mac.c, 1.7, 1.8 mac.h,
1.3, NONE minix.c, 1.4, 1.5 minix.h, 1.3, NONE msdos.c, 1.6,
1.7 msdos.h, 1.3, NONE ntfs.c, 1.7, 1.8 ntfs.h, 1.3,
NONE nvidia_raid.c, 1.4, 1.5 nvidia_raid.h, 1.3, NONE ocfs.c,
1.1, 1.2 ocfs.h, 1.1, NONE promise_raid.c, 1.4,
1.5 promise_raid.h, 1.3, NONE reiserfs.c, 1.8, 1.9 reiserfs.h,
1.3, NONE romfs.c, 1.6, 1.7 romfs.h, 1.3, NONE silicon_raid.c,
1.4, 1.5 silicon_raid.h, 1.3, NONE sysv.c, 1.6, 1.7 sysv.h,
1.3, NONE udf.c, 1.6, 1.7 udf.h, 1.3, NONE ufs.c, 1.6,
1.7 ufs.h, 1.3, NONE util.h, 1.8, 1.9 via_raid.c, 1.4,
1.5 via_raid.h, 1.3, NONE volume_id.c, 1.12, 1.13 volume_id.h,
1.11, 1.12 vxfs.c, 1.1, 1.2 vxfs.h, 1.1, NONE xfs.c, 1.6,
1.7 xfs.h, 1.3, NONE
Kay Sievers
kay at freedesktop.org
Mon Nov 14 19:32:39 PST 2005
Update of /cvs/hal/hal/volume_id
In directory gabe:/tmp/cvs-serv2223/volume_id
Modified Files:
Makefile.am cramfs.c ext.c fat.c hfs.c highpoint.c hpfs.c
iso9660.c isw_raid.c jfs.c linux_raid.c linux_swap.c
lsi_raid.c luks.c lvm.c mac.c minix.c msdos.c ntfs.c
nvidia_raid.c ocfs.c promise_raid.c reiserfs.c romfs.c
silicon_raid.c sysv.c udf.c ufs.c util.h via_raid.c
volume_id.c volume_id.h vxfs.c xfs.c
Removed Files:
cramfs.h ext.h fat.h hfs.h highpoint.h hpfs.h iso9660.h
isw_raid.h jfs.h linux_raid.h linux_swap.h lsi_raid.h luks.h
lvm.h mac.h minix.h msdos.h ntfs.h nvidia_raid.h ocfs.h
promise_raid.h reiserfs.h romfs.h silicon_raid.h sysv.h udf.h
ufs.h via_raid.h vxfs.h xfs.h
Log Message:
2005-11-15 Kay Sievers <kay.sievers at vrfy.org>
libvolume_id: sync with udev version and prepare
for a possible future external dependency.
* hald/linux2/probing/probe-volume.c: (advanced_disc_detect): Switch
to glib function instead of the volume_id private ones.
* volume_id/Makefile.am: Merge individual headers into the main
public header.
* volume_id/cramfs.c:
* volume_id/cramfs.h:
* volume_id/ext.c:
* volume_id/ext.h:
* volume_id/fat.c:
* volume_id/fat.h:
* volume_id/hfs.c:
* volume_id/hfs.h:
* volume_id/highpoint.c:
* volume_id/highpoint.h:
* volume_id/hpfs.c:
* volume_id/hpfs.h:
* volume_id/iso9660.c:
* volume_id/iso9660.h:
* volume_id/isw_raid.c:
* volume_id/isw_raid.h:
* volume_id/jfs.c:
* volume_id/jfs.h:
* volume_id/linux_raid.c:
* volume_id/linux_raid.h:
* volume_id/linux_swap.c:
* volume_id/linux_swap.h:
* volume_id/lsi_raid.c:
* volume_id/lsi_raid.h:
* volume_id/luks.c:
* volume_id/luks.h:
* volume_id/lvm.c:
* volume_id/lvm.h:
* volume_id/mac.c:
* volume_id/mac.h:
* volume_id/minix.c:
* volume_id/minix.h:
* volume_id/msdos.c:
* volume_id/msdos.h:
* volume_id/ntfs.c:
* volume_id/ntfs.h:
* volume_id/nvidia_raid.c:
* volume_id/nvidia_raid.h:
* volume_id/ocfs.c:
* volume_id/ocfs.h:
* volume_id/promise_raid.c:
* volume_id/promise_raid.h:
* volume_id/reiserfs.c:
* volume_id/reiserfs.h:
* volume_id/romfs.c:
* volume_id/romfs.h:
* volume_id/silicon_raid.c:
* volume_id/silicon_raid.h:
* volume_id/sysv.c:
* volume_id/sysv.h:
* volume_id/udf.c:
* volume_id/udf.h:
* volume_id/ufs.c:
* volume_id/ufs.h:
* volume_id/util.h:
* volume_id/via_raid.c:
* volume_id/via_raid.h:
* volume_id/volume_id.c:
* volume_id/volume_id.h:
* volume_id/vxfs.c:
* volume_id/vxfs.h:
* volume_id/xfs.c:
* volume_id/xfs.h:
Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/volume_id/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am 23 Oct 2005 20:10:59 -0000 1.8
+++ Makefile.am 15 Nov 2005 03:32:36 -0000 1.9
@@ -3,37 +3,39 @@
INCLUDES = -DDEBUG
-libvolume_id_la_SOURCES = \
- ext.h ext.c \
- fat.h fat.c \
- hfs.h hfs.c \
- highpoint.h highpoint.c \
- isw_raid.h isw_raid.c \
- lsi_raid.h lsi_raid.c \
- via_raid.h via_raid.c \
- silicon_raid.h silicon_raid.c \
- nvidia_raid.h nvidia_raid.c \
- promise_raid.h promise_raid.c \
- iso9660.h iso9660.c \
- jfs.h jfs.c \
- linux_raid.h linux_raid.c \
- linux_swap.h linux_swap.c \
- lvm.h lvm.c \
- luks.h luks.c \
- mac.h mac.c \
- msdos.h msdos.c \
- ntfs.h ntfs.c \
- reiserfs.h reiserfs.c \
- udf.h udf.c \
- ufs.h ufs.c \
- xfs.h xfs.c \
- hpfs.h hpfs.c \
- romfs.h romfs.c \
- sysv.h sysv.c \
- cramfs.h cramfs.c \
- minix.h minix.c \
- ocfs.h ocfs.c \
- vxfs.h vxfs.c \
- logging.h \
- util.h util.c \
- volume_id.h volume_id.c
+libvolume_id_la_SOURCES = \
+ ext.c \
+ fat.c \
+ hfs.c \
+ highpoint.c \
+ isw_raid.c \
+ lsi_raid.c \
+ via_raid.c \
+ silicon_raid.c \
+ nvidia_raid.c \
+ promise_raid.c \
+ iso9660.c \
+ jfs.c \
+ linux_raid.c \
+ linux_swap.c \
+ lvm.c \
+ luks.c \
+ mac.c \
+ msdos.c \
+ ntfs.c \
+ reiserfs.c \
+ udf.c \
+ ufs.c \
+ xfs.c \
+ hpfs.c \
+ romfs.c \
+ sysv.c \
+ cramfs.c \
+ minix.c \
+ ocfs.c \
+ vxfs.c \
+ logging.h \
+ util.h \
+ util.c \
+ volume_id.h \
+ volume_id.c
Index: cramfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/cramfs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cramfs.c 23 Oct 2005 20:10:59 -0000 1.5
+++ cramfs.c 15 Nov 2005 03:32:36 -0000 1.6
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "cramfs.h"
struct cramfs_super {
uint8_t magic[4];
--- cramfs.h DELETED ---
Index: ext.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/ext.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ext.c 23 Oct 2005 20:10:59 -0000 1.6
+++ ext.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "util.h"
#include "logging.h"
-#include "ext.h"
struct ext2_super_block {
uint32_t s_inodes_count;
--- ext.h DELETED ---
Index: fat.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/fat.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fat.c 23 Oct 2005 20:10:59 -0000 1.8
+++ fat.c 15 Nov 2005 03:32:36 -0000 1.9
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "fat.h"
#define FAT12_MAX 0xff5
#define FAT16_MAX 0xfff5
--- fat.h DELETED ---
Index: hfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/hfs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hfs.c 23 Oct 2005 20:10:59 -0000 1.6
+++ hfs.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "hfs.h"
struct hfs_finder_info{
uint32_t boot_folder;
--- hfs.h DELETED ---
Index: highpoint.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/highpoint.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- highpoint.c 23 Oct 2005 20:10:59 -0000 1.7
+++ highpoint.c 15 Nov 2005 03:32:36 -0000 1.8
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "highpoint.h"
struct hpt37x_meta {
uint8_t filler1[32];
--- highpoint.h DELETED ---
Index: hpfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/hpfs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hpfs.c 23 Oct 2005 20:10:59 -0000 1.5
+++ hpfs.c 15 Nov 2005 03:32:36 -0000 1.6
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "hpfs.h"
struct hpfs_super
{
--- hpfs.h DELETED ---
Index: iso9660.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/iso9660.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- iso9660.c 23 Oct 2005 20:10:59 -0000 1.7
+++ iso9660.c 15 Nov 2005 03:32:36 -0000 1.8
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "iso9660.h"
#define ISO_SUPERBLOCK_OFFSET 0x8000
#define ISO_SECTOR_SIZE 0x800
--- iso9660.h DELETED ---
Index: isw_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/isw_raid.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- isw_raid.c 23 Oct 2005 20:10:59 -0000 1.5
+++ isw_raid.c 15 Nov 2005 03:32:36 -0000 1.6
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "isw_raid.h"
struct isw_meta {
uint8_t sig[32];
--- isw_raid.h DELETED ---
Index: jfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/jfs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jfs.c 23 Oct 2005 20:10:59 -0000 1.6
+++ jfs.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "jfs.h"
struct jfs_super_block {
uint8_t magic[4];
--- jfs.h DELETED ---
Index: linux_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/linux_raid.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- linux_raid.c 23 Oct 2005 20:10:59 -0000 1.7
+++ linux_raid.c 15 Nov 2005 03:32:36 -0000 1.8
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "linux_raid.h"
struct mdp_super_block {
uint32_t md_magic;
--- linux_raid.h DELETED ---
Index: linux_swap.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/linux_swap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- linux_swap.c 23 Oct 2005 20:10:59 -0000 1.6
+++ linux_swap.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "linux_swap.h"
struct swap_header_v1_2 {
uint8_t bootbits[1024];
--- linux_swap.h DELETED ---
Index: lsi_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/lsi_raid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lsi_raid.c 23 Oct 2005 20:10:59 -0000 1.4
+++ lsi_raid.c 15 Nov 2005 03:32:36 -0000 1.5
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "lsi_raid.h"
struct lsi_meta {
uint8_t sig[6];
--- lsi_raid.h DELETED ---
Index: luks.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/luks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- luks.c 23 Oct 2005 20:10:59 -0000 1.7
+++ luks.c 15 Nov 2005 03:32:36 -0000 1.8
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "util.h"
#include "logging.h"
-#include "luks.h"
#define SECTOR_SHIFT 9
#define SECTOR_SIZE (1 << SECTOR_SHIFT)
--- luks.h DELETED ---
Index: lvm.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/lvm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lvm.c 23 Oct 2005 20:10:59 -0000 1.7
+++ lvm.c 15 Nov 2005 03:32:36 -0000 1.8
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "lvm.h"
struct lvm1_super_block {
uint8_t id[2];
--- lvm.h DELETED ---
Index: mac.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/mac.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mac.c 23 Oct 2005 20:10:59 -0000 1.7
+++ mac.c 15 Nov 2005 03:32:36 -0000 1.8
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "mac.h"
struct mac_driver_desc {
uint8_t signature[2];
--- mac.h DELETED ---
Index: minix.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/minix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- minix.c 23 Oct 2005 20:10:59 -0000 1.4
+++ minix.c 15 Nov 2005 03:32:36 -0000 1.5
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "minix.h"
struct minix_super_block
{
--- minix.h DELETED ---
Index: msdos.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/msdos.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- msdos.c 23 Oct 2005 20:10:59 -0000 1.6
+++ msdos.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "msdos.h"
struct msdos_partition_entry {
uint8_t boot_ind;
--- msdos.h DELETED ---
Index: ntfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/ntfs.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ntfs.c 23 Oct 2005 20:10:59 -0000 1.7
+++ ntfs.c 15 Nov 2005 03:32:36 -0000 1.8
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "ntfs.h"
struct ntfs_super_block {
uint8_t jump[3];
--- ntfs.h DELETED ---
Index: nvidia_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/nvidia_raid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nvidia_raid.c 23 Oct 2005 20:10:59 -0000 1.4
+++ nvidia_raid.c 15 Nov 2005 03:32:36 -0000 1.5
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "nvidia_raid.h"
struct nvidia_meta {
uint8_t vendor[8];
--- nvidia_raid.h DELETED ---
Index: ocfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/ocfs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ocfs.c 23 Oct 2005 20:10:59 -0000 1.1
+++ ocfs.c 15 Nov 2005 03:32:36 -0000 1.2
@@ -27,7 +27,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "ocfs.h"
struct ocfs1_super_block_header {
--- ocfs.h DELETED ---
Index: promise_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/promise_raid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- promise_raid.c 23 Oct 2005 20:10:59 -0000 1.4
+++ promise_raid.c 15 Nov 2005 03:32:36 -0000 1.5
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "promise_raid.h"
struct promise_meta {
uint8_t sig[24];
--- promise_raid.h DELETED ---
Index: reiserfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/reiserfs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- reiserfs.c 23 Oct 2005 20:10:59 -0000 1.8
+++ reiserfs.c 15 Nov 2005 03:32:36 -0000 1.9
@@ -27,7 +27,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "reiserfs.h"
struct reiserfs_super_block {
uint32_t blocks_count;
--- reiserfs.h DELETED ---
Index: romfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/romfs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- romfs.c 23 Oct 2005 20:10:59 -0000 1.6
+++ romfs.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "romfs.h"
struct romfs_super {
uint8_t magic[8];
--- romfs.h DELETED ---
Index: silicon_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/silicon_raid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- silicon_raid.c 23 Oct 2005 20:10:59 -0000 1.4
+++ silicon_raid.c 15 Nov 2005 03:32:36 -0000 1.5
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "silicon_raid.h"
struct silicon_meta {
uint8_t unknown0[0x2E];
--- silicon_raid.h DELETED ---
Index: sysv.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/sysv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sysv.c 23 Oct 2005 20:10:59 -0000 1.6
+++ sysv.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "sysv.h"
#define SYSV_NICINOD 100
#define SYSV_NICFREE 50
--- sysv.h DELETED ---
Index: udf.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/udf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- udf.c 23 Oct 2005 20:10:59 -0000 1.6
+++ udf.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "udf.h"
struct volume_descriptor {
struct descriptor_tag {
--- udf.h DELETED ---
Index: ufs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/ufs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ufs.c 23 Oct 2005 20:11:00 -0000 1.6
+++ ufs.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "ufs.h"
struct ufs_super_block {
uint32_t fs_link;
--- ufs.h DELETED ---
Index: util.h
===================================================================
RCS file: /cvs/hal/hal/volume_id/util.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- util.h 23 Oct 2005 20:11:00 -0000 1.8
+++ util.h 15 Nov 2005 03:32:36 -0000 1.9
@@ -20,48 +20,31 @@
#endif
#include <endian.h>
+#include <byteswap.h>
/* size of superblock buffer, reiserfs block is at 64k */
#define SB_BUFFER_SIZE 0x11000
/* size of seek buffer, FAT cluster is 32k max */
#define SEEK_BUFFER_SIZE 0x10000
-/* probe volume for all known filesystems in specific order */
-#define bswap16(x) (uint16_t) ((((uint16_t)(x) & 0x00ffu) << 8) | \
- (((uint16_t)(x) & 0xff00u) >> 8))
-
-#define bswap32(x) (uint32_t) ((((uint32_t)(x) & 0xff000000u) >> 24) | \
- (((uint32_t)(x) & 0x00ff0000u) >> 8) | \
- (((uint32_t)(x) & 0x0000ff00u) << 8) | \
- (((uint32_t)(x) & 0x000000ffu) << 24))
-
-#define bswap64(x) (uint64_t) ((((uint64_t)(x) & 0xff00000000000000ull) >> 56) | \
- (((uint64_t)(x) & 0x00ff000000000000ull) >> 40) | \
- (((uint64_t)(x) & 0x0000ff0000000000ull) >> 24) | \
- (((uint64_t)(x) & 0x000000ff00000000ull) >> 8) | \
- (((uint64_t)(x) & 0x00000000ff000000ull) << 8) | \
- (((uint64_t)(x) & 0x0000000000ff0000ull) << 24) | \
- (((uint64_t)(x) & 0x000000000000ff00ull) << 40) | \
- (((uint64_t)(x) & 0x00000000000000ffull) << 56))
-
#ifdef __BYTE_ORDER
#if (__BYTE_ORDER == __LITTLE_ENDIAN)
#define le16_to_cpu(x) (x)
#define le32_to_cpu(x) (x)
#define le64_to_cpu(x) (x)
-#define be16_to_cpu(x) bswap16(x)
-#define be32_to_cpu(x) bswap32(x)
+#define be16_to_cpu(x) bswap_16(x)
+#define be32_to_cpu(x) bswap_32(x)
#define cpu_to_le16(x) (x)
#define cpu_to_le32(x) (x)
-#define cpu_to_be32(x) bswap32(x)
+#define cpu_to_be32(x) bswap_32(x)
#elif (__BYTE_ORDER == __BIG_ENDIAN)
-#define le16_to_cpu(x) bswap16(x)
-#define le32_to_cpu(x) bswap32(x)
-#define le64_to_cpu(x) bswap64(x)
+#define le16_to_cpu(x) bswap_16(x)
+#define le32_to_cpu(x) bswap_32(x)
+#define le64_to_cpu(x) bswap_64(x)
#define be16_to_cpu(x) (x)
#define be32_to_cpu(x) (x)
-#define cpu_to_le16(x) bswap16(x)
-#define cpu_to_le32(x) bswap32(x)
+#define cpu_to_le16(x) bswap_16(x)
+#define cpu_to_le32(x) bswap_32(x)
#define cpu_to_be32(x) (x)
#endif
#endif /* __BYTE_ORDER */
Index: via_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/via_raid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- via_raid.c 23 Oct 2005 20:11:00 -0000 1.4
+++ via_raid.c 15 Nov 2005 03:32:36 -0000 1.5
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "via_raid.h"
struct via_meta {
uint16_t signature;
--- via_raid.h DELETED ---
Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/volume_id.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- volume_id.c 23 Oct 2005 20:11:00 -0000 1.12
+++ volume_id.c 15 Nov 2005 03:32:36 -0000 1.13
@@ -30,36 +30,6 @@
#include "logging.h"
#include "util.h"
-#include "ext.h"
-#include "reiserfs.h"
-#include "fat.h"
-#include "hfs.h"
-#include "jfs.h"
-#include "xfs.h"
-#include "ufs.h"
-#include "ntfs.h"
-#include "iso9660.h"
-#include "udf.h"
-#include "highpoint.h"
-#include "isw_raid.h"
-#include "lsi_raid.h"
-#include "via_raid.h"
-#include "silicon_raid.h"
-#include "nvidia_raid.h"
-#include "promise_raid.h"
-#include "luks.h"
-#include "linux_swap.h"
-#include "linux_raid.h"
-#include "lvm.h"
-#include "cramfs.h"
-#include "hpfs.h"
-#include "romfs.h"
-#include "sysv.h"
-#include "minix.h"
-#include "mac.h"
-#include "msdos.h"
-#include "ocfs.h"
-#include "vxfs.h"
int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
{
@@ -213,28 +183,6 @@
return id;
}
-/* open volume by major/minor */
-struct volume_id *volume_id_open_dev_t(dev_t devt)
-{
- struct volume_id *id;
- char tmp_node[VOLUME_ID_PATH_MAX];
-
- snprintf(tmp_node, VOLUME_ID_PATH_MAX,
- "/dev/.volume_id-%u-%u-%u", getpid(), major(devt), minor(devt));
- tmp_node[VOLUME_ID_PATH_MAX-1] = '\0';
-
- /* create tempory node to open the block device */
- unlink(tmp_node);
- if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0)
- return NULL;
-
- id = volume_id_open_node(tmp_node);
-
- unlink(tmp_node);
-
- return id;
-}
-
void volume_id_close(struct volume_id *id)
{
if (id == NULL)
Index: volume_id.h
===================================================================
RCS file: /cvs/hal/hal/volume_id/volume_id.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- volume_id.h 23 Oct 2005 20:11:00 -0000 1.11
+++ volume_id.h 15 Nov 2005 03:32:36 -0000 1.12
@@ -12,8 +12,9 @@
#define _VOLUME_ID_H_
#include <stdint.h>
+#include <stddef.h>
-#define VOLUME_ID_VERSION 52
+#define VOLUME_ID_VERSION 54
#define VOLUME_ID_LABEL_SIZE 64
#define VOLUME_ID_UUID_SIZE 36
@@ -67,8 +68,50 @@
extern struct volume_id *volume_id_open_fd(int fd);
extern struct volume_id *volume_id_open_node(const char *path);
-extern struct volume_id *volume_id_open_dev_t(dev_t devt);
extern int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size);
extern void volume_id_close(struct volume_id *id);
+/* filesystems */
+extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ext(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_minix(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_udf(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off);
+
+/* special formats */
+extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_luks(struct volume_id *id, uint64_t off);
+
+/* raid */
+extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off);
+
+/* bios raid */
+extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size);
+
+/* partition tables */
+extern int volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off);
+
#endif
Index: vxfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/vxfs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vxfs.c 24 Oct 2005 17:26:20 -0000 1.1
+++ vxfs.c 15 Nov 2005 03:32:36 -0000 1.2
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "vxfs.h"
#define VXFS_SUPER_MAGIC 0xa501FCF5
--- vxfs.h DELETED ---
Index: xfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/xfs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xfs.c 23 Oct 2005 20:11:00 -0000 1.6
+++ xfs.c 15 Nov 2005 03:32:36 -0000 1.7
@@ -26,7 +26,6 @@
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "xfs.h"
struct xfs_super_block {
uint8_t magic[4];
--- xfs.h DELETED ---
More information about the hal-commit
mailing list