Modified UNIX simulator port so all references to native unix

stuff is in the executive source proper in the file cpu.c.  This
should help avoid conflicts between RTEMS POSIX files and UNIX files.

8 files changed, 24 insertions, 24 deletions

diff --git a/testsuites/sptests/sp12/sp12.scn b/testsuites/sptests/sp12/sp12.scn
index ff120e7545..e87a729259 100644
--- a/testsuites/sptests/sp12/sp12.scn
+++ b/testsuites/sptests/sp12/sp12.scn
@@ -35,7 +35,7 @@ PRI5 - rtems_semaphore_release - nested
 PRI5 - rtems_semaphore_release - restore priority
 PRI5 - priority of PRI5 is 68
 <pause>
-TA1 - rtems_semaphore_ident - smid => 10010002
+TA1 - rtems_semaphore_ident - smid => 14010002
 TA1 - rtems_semaphore_obtain - wait forever on SM2
 TA1 - got SM2
 TA1 - rtems_semaphore_obtain - wait forever on SM3
diff --git a/testsuites/sptests/sp13/sp13.scn b/testsuites/sptests/sp13/sp13.scn
index 0cd60c9f1d..11adfb8eb3 100644
--- a/testsuites/sptests/sp13/sp13.scn
+++ b/testsuites/sptests/sp13/sp13.scn
@@ -1,5 +1,5 @@
 *** TEST 13 ***
-TA1 - rtems_message_queue_ident - qid => 14010001
+TA1 - rtems_message_queue_ident - qid => 18010001
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1
 TA1 - rtems_task_wake_after - sleep 5 seconds
diff --git a/testsuites/sptests/sp15/sp15.scn b/testsuites/sptests/sp15/sp15.scn
index 4ae8989215..f1a800dc0d 100644
--- a/testsuites/sptests/sp15/sp15.scn
+++ b/testsuites/sptests/sp15/sp15.scn
@@ -1,8 +1,8 @@
 *** TEST 15 ***
 INIT - rtems_partition_create - partition 1
 INIT - rtems_partition_create - partition 2
-TA1 - rtems_partition_ident - partition 1 id = 18010001
-TA1 - rtems_partition_ident - partition 2 id = 18010002
+TA1 - rtems_partition_ident - partition 1 id = 1c010001
+TA1 - rtems_partition_ident - partition 2 id = 1c010002
 TA1 - rtems_partition_get_buffer - buffer 1 from partition 1  - 0x00000000
 TA1 - rtems_partition_get_buffer - buffer 2 from partition 1  - 0x00000200
 TA1 - rtems_partition_get_buffer - buffer 1 from partition 2  - 0x00000000
diff --git a/testsuites/sptests/sp16/sp16.scn b/testsuites/sptests/sp16/sp16.scn
index cb994c7300..36d533c2b4 100644
--- a/testsuites/sptests/sp16/sp16.scn
+++ b/testsuites/sptests/sp16/sp16.scn
@@ -1,5 +1,5 @@
 *** TEST 16 ***
-TA1 - rtems_region_ident - rnid => 1c010002
+TA1 - rtems_region_ident - rnid => 20010002
 TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2
 TA1 - got segment from region 2 - 0x00000f78
 TA1 - rtems_region_get_segment - wait on 3K segment from region 3
diff --git a/testsuites/sptests/sp20/sp20.scn b/testsuites/sptests/sp20/sp20.scn
index 7c948c5469..bb4e8814da 100644
--- a/testsuites/sptests/sp20/sp20.scn
+++ b/testsuites/sptests/sp20/sp20.scn
@@ -1,19 +1,19 @@
 *** TEST 20 ***
-TA1 - rtems_rate_monotonic_create id = 0x24010001
-TA1 - rtems_rate_monotonic_ident id = 0x24010001
-TA1 - (0x24010001) period 2
-TA2 - rtems_rate_monotonic_create id = 0x24010002
-TA2 - rtems_rate_monotonic_ident id = 0x24010002
-TA2 - (0x24010002) period 2
-TA3 - rtems_rate_monotonic_create id = 0x24010003
-TA3 - rtems_rate_monotonic_ident id = 0x24010003
-TA3 - (0x24010003) period 2
-TA4 - rtems_rate_monotonic_create id = 0x24010004
-TA4 - rtems_rate_monotonic_ident id = 0x24010004
-TA4 - (0x24010004) period 2
-TA5 - rtems_rate_monotonic_create id = 0x24010005
-TA5 - rtems_rate_monotonic_ident id = 0x24010005
-TA5 - (0x24010005) period 100
+TA1 - rtems_rate_monotonic_create id = 0x28010001
+TA1 - rtems_rate_monotonic_ident id = 0x28010001
+TA1 - (0x28010001) period 2
+TA2 - rtems_rate_monotonic_create id = 0x28010002
+TA2 - rtems_rate_monotonic_ident id = 0x28010002
+TA2 - (0x28010002) period 2
+TA3 - rtems_rate_monotonic_create id = 0x28010003
+TA3 - rtems_rate_monotonic_ident id = 0x28010003
+TA3 - (0x28010003) period 2
+TA4 - rtems_rate_monotonic_create id = 0x28010004
+TA4 - rtems_rate_monotonic_ident id = 0x28010004
+TA4 - (0x28010004) period 2
+TA5 - rtems_rate_monotonic_create id = 0x28010005
+TA5 - rtems_rate_monotonic_ident id = 0x28010005
+TA5 - (0x28010005) period 100
 TA5 - PERIODS CHECK OK (1)
 TA5 - PERIODS CHECK OK (2)
 TA5 - PERIODS CHECK OK (3)
diff --git a/testsuites/sptests/sp22/sp22.scn b/testsuites/sptests/sp22/sp22.scn
index 8d2acd1867..6fb08156c5 100644
--- a/testsuites/sptests/sp22/sp22.scn
+++ b/testsuites/sptests/sp22/sp22.scn
@@ -1,8 +1,8 @@
 *** TEST 22 ***
 INIT - rtems_timer_create - creating timer 1
-INIT - timer 1 has id (0xc010001)
+INIT - timer 1 has id (0x10010001)
 TA1 - rtems_timer_ident - identing timer 1
-TA1 - timer 1 has id (0xc010001)
+TA1 - timer 1 has id (0x10010001)
 TA1 - rtems_clock_get - 09:00:00   12/31/1988
 TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
 TA1 - rtems_task_suspend( RTEMS_SELF )
diff --git a/testsuites/sptests/sp23/sp23.scn b/testsuites/sptests/sp23/sp23.scn
index 70522d79ab..b8b5633855 100644
--- a/testsuites/sptests/sp23/sp23.scn
+++ b/testsuites/sptests/sp23/sp23.scn
@@ -1,6 +1,6 @@
 *** TEST 23 ***
 INIT - rtems_port_create - DP1 - int = 0x00001000   ext = 0x00002000
-TA1 - rtems_port_ident - 0x20010001
+TA1 - rtems_port_ident - 0x24010001
 TA1 - rtems_port_external_to_internal - 0x0000200e  =>  0x0000100e
 TA1 - rtems_port_internal_to_external - 0x0000100e  =>  0x0000200e
 TA1 - rtems_port_external_to_internal - 0x0000300e  =>  0x0000300e
diff --git a/testsuites/sptests/sp25/sp25.scn b/testsuites/sptests/sp25/sp25.scn
index f72da25944..af2599663d 100644
--- a/testsuites/sptests/sp25/sp25.scn
+++ b/testsuites/sptests/sp25/sp25.scn
@@ -1,5 +1,5 @@
 *** TEST 25 ***
-TA1 - rtems_region_ident - 0x1c010002
+TA1 - rtems_region_ident - 0x20010002
 TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1
 TA1 - got segment from region 1 - 0x0000f9b8
 TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1