--- tme/generic/bus-device-auto.sh	2018/04/24 16:41:13	1.1.1.2
+++ tme/generic/bus-device-auto.sh	2018/04/24 16:43:00	1.1.1.3
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $Id: bus-device-auto.sh,v 1.1.1.2 2018/04/24 16:41:13 root Exp $
+# $Id: bus-device-auto.sh,v 1.1.1.3 2018/04/24 16:43:00 root Exp $
 
 # generic/bus-device-auto.sh - automatically generates C code for
 # generic bus device support:
@@ -48,26 +48,12 @@ done
 PROG=`basename $0`
 cat <<EOF
 /* automatically generated by $PROG, do not edit! */
-_TME_RCSID("\$Id: bus-device-auto.sh,v 1.1.1.2 2018/04/24 16:41:13 root Exp $");
+_TME_RCSID("\$Id: bus-device-auto.sh,v 1.1.1.3 2018/04/24 16:43:00 root Exp $");
 EOF
 
 if $header; then :; else
     cat <<EOF
 
-/* this indexes an initiator bus router array for a device with a port size
-   of 8 * (2 ^ siz_lg2) bits: */
-#define TME_BUS_ROUTER_INIT_INDEX(siz_lg2, cycle_size, address) \\
-(((                                                             \\
-   /* by the maximum cycle size: */                             \\
-   ((cycle_size) - 1)                                           \\
-                                                                \\
-   /* by the address alignment: */                              \\
-   << siz_lg2)                                                  \\
-  + ((address) & ((1 << (siz_lg2)) - 1)))                       \\
-                                                                \\
- /* factor in the size of the generic bus router array: */      \\
- * TME_BUS_ROUTER_SIZE(siz_lg2))
-
 /* this gives the number of entries that must be in a generic bus
    router array for a device with a bus size of 8 * (2 ^ siz_lg2)
    bits: */
@@ -296,9 +282,8 @@ while test ${i_width} != 32; do
 	echo "      /* unbusy this TLB entry for filling: */"
 	echo "      tme_bus_tlb_unbusy_fill(tlb);"
 	echo ""
-	echo "      /* reserve this TLB entry: */"
-	echo "      tlb_local.tme_bus_tlb_global = tlb;"
-	echo "      tlb = &tlb_local;"
+	echo "      /* pass this TLB's token: */"
+	echo "      tlb_local.tme_bus_tlb_token = tlb->tme_bus_tlb_token;"
 	echo ""
 	echo "      /* get our bus connection: */"
 	echo "      conn_bus = tme_memory_atomic_pointer_read(struct tme_bus_connection *,"
@@ -311,7 +296,7 @@ while test ${i_width} != 32; do
 	echo "      /* reload the TLB entry: */"
 	echo "      err = (*conn_bus->tme_bus_tlb_fill)"
 	echo "              (conn_bus,"
-	echo "               tlb,"
+	echo "               &tlb_local,"
 	echo "               address_init,"
 	echo "               TME_BUS_CYCLE_${capname});"
 	echo ""
@@ -324,7 +309,7 @@ while test ${i_width} != 32; do
 	echo "      }"
 	echo ""
 	echo "      /* store the TLB entry: */"
-	echo "      tme_bus_tlb_back(tlb);"
+	echo "      *tlb = tlb_local;"
 	echo ""
 	echo "      /* loop to check the newly filled TLB entry: */"
 	echo "      continue;"