aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board-js2x/slof/bcm57xx.fs4
-rw-r--r--board-qemu/slof/e1k.fs6
-rw-r--r--board-qemu/slof/vio-veth.fs4
-rw-r--r--board-qemu/slof/virtio-net.fs4
4 files changed, 9 insertions, 9 deletions
diff --git a/board-js2x/slof/bcm57xx.fs b/board-js2x/slof/bcm57xx.fs
index e4f8776..c8e6f5a 100644
--- a/board-js2x/slof/bcm57xx.fs
+++ b/board-js2x/slof/bcm57xx.fs
@@ -24,7 +24,6 @@ VARIABLE obp-tftp-package
: open ( -- okay? )
open-count 0= IF
open IF
- my-args s" obp-tftp" $open-package obp-tftp-package !
bcm57xx-open dup not IF ." bcm57xx-open failed" EXIT THEN
drop dup TO bcm57xx-priv
6 encode-bytes s" local-mac-address" property
@@ -35,6 +34,7 @@ VARIABLE obp-tftp-package
ELSE
true
THEN
+ my-args s" obp-tftp" $open-package obp-tftp-package !
open-count 1 + to open-count
;
@@ -43,11 +43,11 @@ VARIABLE obp-tftp-package
open-count 0> IF
open-count 1 - dup to open-count
0= IF
- s" close" obp-tftp-package @ $call-method
bcm57xx-priv bcm57xx-close
close
THEN
THEN
+ s" close" obp-tftp-package @ $call-method
;
: read ( buf len -- actual )
diff --git a/board-qemu/slof/e1k.fs b/board-qemu/slof/e1k.fs
index 7b8e8e6..1f2b192 100644
--- a/board-qemu/slof/e1k.fs
+++ b/board-qemu/slof/e1k.fs
@@ -22,7 +22,6 @@ INSTANCE VARIABLE obp-tftp-package
: open ( -- okay? )
open-count 0= IF
open IF
- my-args s" obp-tftp" $open-package obp-tftp-package !
e1k-open dup not IF ." e1k-open failed" EXIT THEN
drop TO e1k-priv
true
@@ -32,19 +31,20 @@ INSTANCE VARIABLE obp-tftp-package
ELSE
true
THEN
+ my-args s" obp-tftp" $open-package obp-tftp-package !
open-count 1 + to open-count
;
: close ( -- )
- open-count 0> IF
+ open-count 0> IF
open-count 1 - dup to open-count
0= IF
- s" close" obp-tftp-package @ $call-method
e1k-priv e1k-close
close
THEN
THEN
+ s" close" obp-tftp-package @ $call-method
;
: read ( buf len -- actual )
diff --git a/board-qemu/slof/vio-veth.fs b/board-qemu/slof/vio-veth.fs
index f6d1684..6a03e6c 100644
--- a/board-qemu/slof/vio-veth.fs
+++ b/board-qemu/slof/vio-veth.fs
@@ -21,7 +21,6 @@ INSTANCE VARIABLE obp-tftp-package
: open ( -- okay? )
open-count 0= IF
my-unit 1 rtas-set-tce-bypass
- my-args s" obp-tftp" $open-package obp-tftp-package !
s" local-mac-address" get-node get-property not
s" reg" get-node get-property not 3 pick and IF
>r nip r>
@@ -29,6 +28,7 @@ INSTANCE VARIABLE obp-tftp-package
drop TO veth-priv
THEN
THEN
+ my-args s" obp-tftp" $open-package obp-tftp-package !
open-count 1 + to open-count
true
;
@@ -37,11 +37,11 @@ INSTANCE VARIABLE obp-tftp-package
open-count 0> IF
open-count 1 - dup to open-count
0= IF
- s" close" obp-tftp-package @ $call-method
veth-priv libveth-close
my-unit 0 rtas-set-tce-bypass
THEN
THEN
+ s" close" obp-tftp-package @ $call-method
;
: read ( buf len -- actual )
diff --git a/board-qemu/slof/virtio-net.fs b/board-qemu/slof/virtio-net.fs
index 80ed15c..cdaae58 100644
--- a/board-qemu/slof/virtio-net.fs
+++ b/board-qemu/slof/virtio-net.fs
@@ -25,7 +25,6 @@ virtiodev virtio-setup-vd
open-count 0= IF
open IF
\ my-unit 1 rtas-set-tce-bypass
- my-args s" obp-tftp" $open-package obp-tftp-package !
s" local-mac-address" get-node get-property not IF
virtiodev virtio-net-open dup not IF ." virtio-net-open failed" EXIT THEN
drop TO virtio-net-priv
@@ -37,6 +36,7 @@ virtiodev virtio-setup-vd
ELSE
true
THEN
+ my-args s" obp-tftp" $open-package obp-tftp-package !
open-count 1 + to open-count
;
@@ -45,12 +45,12 @@ virtiodev virtio-setup-vd
open-count 0> IF
open-count 1 - dup to open-count
0= IF
- s" close" obp-tftp-package @ $call-method
virtio-net-priv virtio-net-close
\ my-unit 0 rtas-set-tce-bypass
close
THEN
THEN
+ s" close" obp-tftp-package @ $call-method
;
: read ( buf len -- actual )