[OpenBIOS] [commit] r851 - trunk/openbios-devel/arch/sparc32

repository service svn at openbios.org
Wed Aug 11 22:57:53 CEST 2010


Author: mcayland
Date: Wed Aug 11 22:57:53 2010
New Revision: 851
URL: http://tracker.coreboot.org/trac/openbios/changeset/851

Log:
Revert commit r850 - on reflection, keeping a separate v2 function for obp_devclose() seems a little excessive.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at siriusit.co.uk>

Modified:
   trunk/openbios-devel/arch/sparc32/romvec.c

Modified: trunk/openbios-devel/arch/sparc32/romvec.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/romvec.c	Wed Aug 11 18:41:36 2010	(r850)
+++ trunk/openbios-devel/arch/sparc32/romvec.c	Wed Aug 11 22:57:53 2010	(r851)
@@ -279,26 +279,17 @@
 
 static int obp_devclose(int dev_desc)
 {
-    int ret = 1;
+    int ret;
 
     PUSH(dev_desc);
     fword("close-dev");
+    ret = POP();
 
     DPRINTF("obp_devclose(0x%x) = %d\n", dev_desc, ret);
 
     return ret;
 }
 
-static void obp_devclose_v2(int dev_desc)
-{
-    PUSH(dev_desc);
-    fword("close-dev");
-
-    DPRINTF("obp_devclose_v2(0x%x)\n", dev_desc);
-
-    return;
-}
-
 static int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf)
 {
     int ret, hi, lo, bs;
@@ -468,7 +459,7 @@
     romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap;
     romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap;
     romvec0.pv_v2devops.v2_dev_open = obp_devopen;
-    romvec0.pv_v2devops.v2_dev_close = obp_devclose_v2;
+    romvec0.pv_v2devops.v2_dev_close = (void (*)(int))obp_devclose;
     romvec0.pv_v2devops.v2_dev_read = obp_devread;
     romvec0.pv_v2devops.v2_dev_write = obp_devwrite;
     romvec0.pv_v2devops.v2_dev_seek = obp_devseek;



More information about the OpenBIOS mailing list