chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add "Persistent Device Naming" rules file for disks
[elogind.git]
/
extras
/
volume_id
/
volume_id
/
highpoint.c
diff --git
a/extras/volume_id/volume_id/highpoint.c
b/extras/volume_id/volume_id/highpoint.c
index 938a8934e57d6559f21a7735552fe6bafd671604..baa278ba806042829fab0b1f2475e06f40faf1c8 100644
(file)
--- a/
extras/volume_id/volume_id/highpoint.c
+++ b/
extras/volume_id/volume_id/highpoint.c
@@
-32,7
+32,6
@@
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
-#include <asm/types.h>
#include "volume_id.h"
#include "logging.h"
#include "volume_id.h"
#include "logging.h"
@@
-40,12
+39,12
@@
#include "highpoint.h"
struct hpt37x_meta {
#include "highpoint.h"
struct hpt37x_meta {
-
__u8
filler1[32];
-
__u32
magic;
+
uint8_t
filler1[32];
+
uint32_t
magic;
} __attribute__((packed));
struct hpt45x_meta {
} __attribute__((packed));
struct hpt45x_meta {
-
__u32
magic;
+
uint32_t
magic;
} __attribute__((packed));
#define HPT37X_CONFIG_OFF 0x1200
} __attribute__((packed));
#define HPT37X_CONFIG_OFF 0x1200
@@
-56,11
+55,11
@@
struct hpt45x_meta {
#define HPT45X_MAGIC_BAD 0x5a7816fd
#define HPT45X_MAGIC_BAD 0x5a7816fd
-int volume_id_probe_highpoint_37x_raid(struct volume_id *id,
__u64
off)
+int volume_id_probe_highpoint_37x_raid(struct volume_id *id,
uint64_t
off)
{
{
- const
__u8
*buf;
+ const
uint8_t
*buf;
struct hpt37x_meta *hpt;
struct hpt37x_meta *hpt;
-
__u32
magic;
+
uint32_t
magic;
dbg("probing at offset 0x%llx", (unsigned long long) off);
dbg("probing at offset 0x%llx", (unsigned long long) off);
@@
-79,12
+78,12
@@
int volume_id_probe_highpoint_37x_raid(struct volume_id *id, __u64 off)
return 0;
}
return 0;
}
-int volume_id_probe_highpoint_45x_raid(struct volume_id *id,
__u64 off, __u64
size)
+int volume_id_probe_highpoint_45x_raid(struct volume_id *id,
uint64_t off, uint64_t
size)
{
{
- const
__u8
*buf;
+ const
uint8_t
*buf;
struct hpt45x_meta *hpt;
struct hpt45x_meta *hpt;
-
__u64
meta_off;
-
__u32
magic;
+
uint64_t
meta_off;
+
uint32_t
magic;
dbg("probing at offset 0x%llx, size 0x%llx",
(unsigned long long) off, (unsigned long long) size);
dbg("probing at offset 0x%llx, size 0x%llx",
(unsigned long long) off, (unsigned long long) size);