Page MenuHomeFreeBSD

D27475.id80311.diff
No OneTemporary

D27475.id80311.diff

Index: sys/dev/vt/hw/ofwfb/ofwfb.c
===================================================================
--- sys/dev/vt/hw/ofwfb/ofwfb.c
+++ sys/dev/vt/hw/ofwfb/ofwfb.c
@@ -102,7 +102,7 @@
return (CN_DEAD);
node = -1;
- if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) ==
+ if (OF_getencprop(chosen, "stdout", &stdout, sizeof(stdout)) ==
sizeof(stdout))
node = OF_instance_to_package(stdout);
if (node == -1)
@@ -360,7 +360,7 @@
char buf[64];
phandle_t chosen;
phandle_t node;
- uint32_t depth, height, width, stride;
+ pcell_t depth, height, width, stride;
uint32_t fb_phys;
int i, len;
@@ -369,7 +369,7 @@
node = -1;
chosen = OF_finddevice("/chosen");
- if (OF_getprop(chosen, "stdout", &sc->sc_handle,
+ if (OF_getencprop(chosen, "stdout", &sc->sc_handle,
sizeof(ihandle_t)) == sizeof(ihandle_t))
node = OF_instance_to_package(sc->sc_handle);
if (node == -1)
@@ -408,14 +408,14 @@
return (CN_DEAD);
/* Only support 8 and 32-bit framebuffers */
- OF_getprop(node, "depth", &depth, sizeof(depth));
+ OF_getencprop(node, "depth", &depth, sizeof(depth));
if (depth != 8 && depth != 32)
return (CN_DEAD);
sc->fb.fb_bpp = sc->fb.fb_depth = depth;
- OF_getprop(node, "height", &height, sizeof(height));
- OF_getprop(node, "width", &width, sizeof(width));
- if (OF_getprop(node, "linebytes", &stride, sizeof(stride)) !=
+ OF_getencprop(node, "height", &height, sizeof(height));
+ OF_getencprop(node, "width", &width, sizeof(width));
+ if (OF_getencprop(node, "linebytes", &stride, sizeof(stride)) !=
sizeof(stride))
stride = width*depth/8;
@@ -463,11 +463,11 @@
* may be the child of the PCI device: in that case, try the
* parent for the assigned-addresses property.
*/
- len = OF_getprop(node, "assigned-addresses", pciaddrs,
- sizeof(pciaddrs));
+ len = OF_getencprop(node, "assigned-addresses",
+ (pcell_t *)pciaddrs, sizeof(pciaddrs));
if (len == -1) {
- len = OF_getprop(OF_parent(node), "assigned-addresses",
- pciaddrs, sizeof(pciaddrs));
+ len = OF_getencprop(OF_parent(node), "assigned-addresses",
+ (pcell_t *)pciaddrs, sizeof(pciaddrs));
}
if (len == -1)
len = 0;

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 6:20 AM (11 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31015142
Default Alt Text
D27475.id80311.diff (2 KB)

Event Timeline