28c28
< __FBSDID("$FreeBSD: head/sys/boot/uboot/lib/glue.c 182732 2008-09-03 17:48:41Z raj $");
---
> __FBSDID("$FreeBSD: head/sys/boot/uboot/lib/glue.c 183598 2008-10-04 13:10:38Z raj $");
219,221c219
<
< #define MR_MAX 5
< static struct mem_region mr[MR_MAX];
---
> static struct mem_region mr[UB_MAX_MR];
231c229
< si.mr_no = MR_MAX;
---
> si.mr_no = UB_MAX_MR;
270c268
< * Devices are identified by handles: numbers 0, 1, 2, ..., MAX_DEVS-1
---
> * Devices are identified by handles: numbers 0, 1, 2, ..., UB_MAX_DEV-1
274c272
< #define MAX_DEVS 6
---
> static struct device_info devices[UB_MAX_DEV];
276,277d273
< static struct device_info devices[MAX_DEVS];
<
282c278
< return ((i < 0 || i >= MAX_DEVS) ? NULL : &devices[i]);
---
> return ((i < 0 || i >= UB_MAX_DEV) ? NULL : &devices[i]);
297c293
< memset(&devices, 0, sizeof(struct device_info) * MAX_DEVS);
---
> memset(&devices, 0, sizeof(struct device_info) * UB_MAX_DEV);
305c301
< if (++n >= MAX_DEVS)
---
> if (++n >= UB_MAX_DEV)
333c329
< if (handle < 0 || handle >= MAX_DEVS)
---
> if (handle < 0 || handle >= UB_MAX_DEV)
348c344
< if (handle < 0 || handle >= MAX_DEVS)
---
> if (handle < 0 || handle >= UB_MAX_DEV)
370c366
< if (handle < 0 || handle >= MAX_DEVS)
---
> if (handle < 0 || handle >= UB_MAX_DEV)
393c389,390
< ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start)
---
> ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start,
> lbasize_t *rlen)
404c401
< return (-1);
---
> return (API_ESYSC);
406,407c403,404
< if (err)
< return (err);
---
> if (!err && rlen)
> *rlen = act_len;
409,412c406
< if (act_len != len)
< return (API_EIO);
<
< return (0);
---
> return (err);
429c423
< ub_dev_recv(int handle, void *buf, int len)
---
> ub_dev_recv(int handle, void *buf, int len, int *rlen)
439c433
< return (-1);
---
> return (API_ESYSC);
441,442c435,436
< if (err)
< return (-1);
---
> if (!err)
> *rlen = act_len;
444c438
< return (act_len);
---
> return (err);
458c452
< return (-1);
---
> return (API_ESYSC);