diff options
| author | wdenk <wdenk> | 2004-04-18 17:39:38 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-18 17:39:38 +0000 |
| commit | 6e5923851ec5c11a36136abc77160d834537c4dd (patch) | |
| tree | 1d324917e695bf3aadc0041d220304d07d09027a /include | |
| parent | c26e454dfc6650428854fa2db3b1ed7f19e0ba0e (diff) | |
| download | u-boot-imx-6e5923851ec5c11a36136abc77160d834537c4dd.zip u-boot-imx-6e5923851ec5c11a36136abc77160d834537c4dd.tar.gz u-boot-imx-6e5923851ec5c11a36136abc77160d834537c4dd.tar.bz2 | |
* Cleanup, minor fixes
* Patch by Rune Torgersen, 16 Apr 2004:
LBA48 fixes
* Patches by Pantelis Antoniou, 16 Apr 2004:
- Fix some compile problems;
add "once" functionality for the netretry variable
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/NETPHONE.h | 24 | ||||
| -rw-r--r-- | include/part.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index af455e7..d82d5a7 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -664,11 +664,11 @@ typedef unsigned int led_id_t; +------+----------------+------------------------------------------------------------ | # | Name | Comment +------+----------------+------------------------------------------------------------ - | 0 | BKBR1 | (V1) Keyboard input scan - | 1 | BKBR3 | (V1) Keyboard input scan - | 2 | BKBR4 | (V1) Keyboard input scan - | 3 | BKBR2 | (V1) Keyboard input scan - | 4 | HOOK | (V1) Hook switch + | 0 | BKBR1 | (V1) Keyboard input scan + | 1 | BKBR3 | (V1) Keyboard input scan + | 2 | BKBR4 | (V1) Keyboard input scan + | 3 | BKBR2 | (V1) Keyboard input scan + | 4 | HOOK | (V1) Hook switch | 5 | BT_LINK | (V1) Bluetooth link status | 6 | HOST_WAKE | (V1) Bluetooth host wake up | 7 | OK_ETH | (V1) Cisco inline power OK status @@ -681,13 +681,13 @@ typedef unsigned int led_id_t; +------+----------------+------------------------------------------------------------ | # | Name | Comment +------+----------------+------------------------------------------------------------ - | 0 | KEY1 | Keyboard output scan - | 1 | KEY2 | Keyboard output scan - | 2 | KEY3 | Keyboard output scan - | 3 | KEY4 | Keyboard output scan - | 4 | KEY5 | Keyboard output scan - | 5 | KEY6 | Keyboard output scan - | 6 | KEY7 | Keyboard output scan + | 0 | KEY1 | Keyboard output scan + | 1 | KEY2 | Keyboard output scan + | 2 | KEY3 | Keyboard output scan + | 3 | KEY4 | Keyboard output scan + | 4 | KEY5 | Keyboard output scan + | 5 | KEY6 | Keyboard output scan + | 6 | KEY7 | Keyboard output scan | 7 | BT_WAKE | Bluetooth wake up +------+----------------+------------------------------------------------------------ diff --git a/include/part.h b/include/part.h index 5282c85..318aa3c 100644 --- a/include/part.h +++ b/include/part.h @@ -22,7 +22,7 @@ */ #ifndef _PART_H #define _PART_H - +#include <ide.h> typedef struct block_dev_desc { int if_type; /* type of the interface */ @@ -35,14 +35,14 @@ typedef struct block_dev_desc { #ifdef CONFIG_LBA48 unsigned char lba48; /* device can use 48bit addr (ATA/ATAPI v7) */ #endif - unsigned long lba; /* number of blocks */ + lbaint_t lba; /* number of blocks */ unsigned long blksz; /* block size */ unsigned char vendor [40+1]; /* IDE model, SCSI Vendor */ unsigned char product[20+1]; /* IDE Serial no, SCSI product */ unsigned char revision[8+1]; /* firmware revision */ unsigned long (*block_read)(int dev, unsigned long start, - unsigned long blkcnt, + lbaint_t blkcnt, unsigned long *buffer); }block_dev_desc_t; |