mirror of
https://gitlab.com/qemu-project/openbios.git
synced 2024-02-13 08:34:06 +08:00
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@siriusit.co.uk> git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@851 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
committed by
Mark Cave-Ayland
parent
348083a52d
commit
287779605b
@@ -279,26 +279,17 @@ static int obp_devopen(char *str)
|
||||
|
||||
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 @@ init_openprom(void)
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user