# HG changeset patch
# User Ross Younger <wry@ecoscentric.com>
# Date 1417475238 -46800
# Node ID 7905ed422fdfee3b634c1a9f3daacf43ffcc9274
# Parent  abe4f70912a8d2857d7ea0fe6476dee1558b04af
io/nand: Rename CYGINT_IO_NAND_TEST_PARTITION to CYGNUM_IO_NAND_TEST_PARTITION.

diff --git a/packages/io/nand/current/ChangeLog b/packages/io/nand/current/ChangeLog
--- a/packages/io/nand/current/ChangeLog
+++ b/packages/io/nand/current/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-02  Ross Younger  <wry@ecoscentric.com>
+
+	* cdl/nand.cdl tests/nand_readlimits.c tests/nand_readwrite.c
+	* tests/nand_rwbenchmark.c: Rename CYGINT_IO_NAND_TEST_PARTITION to
+	CYGNUM_IO_NAND_TEST_PARTITION.
+
 2014-12-01  Ross Younger  <wry@ecoscentric.com>
 
 	* src/nandinit.cxx: Improve initialiser priority
diff --git a/packages/io/nand/current/cdl/nand.cdl b/packages/io/nand/current/cdl/nand.cdl
--- a/packages/io/nand/current/cdl/nand.cdl
+++ b/packages/io/nand/current/cdl/nand.cdl
@@ -293,7 +293,7 @@ cdl_package CYGPKG_IO_NAND {
                     library tests (and utilities, if enabled) to build."
 	}
 
-    cdl_option CYGINT_IO_NAND_TEST_PARTITION {
+    cdl_option CYGNUM_IO_NAND_TEST_PARTITION {
         display "The NAND partition to use for tests."
         flavor data
         default_value 0
diff --git a/packages/io/nand/current/tests/nand_readlimits.c b/packages/io/nand/current/tests/nand_readlimits.c
--- a/packages/io/nand/current/tests/nand_readlimits.c
+++ b/packages/io/nand/current/tests/nand_readlimits.c
@@ -106,7 +106,7 @@ int cyg_user_start(void)
     diag_printf("Using NAND device %s\n", cyg_nanddevtab->devname);
     CYG_TEST_CHECK(0==cyg_nand_lookup(cyg_nanddevtab->devname, &dev),"lookup failed");
 
-    CYG_TEST_CHECK( NULL != (prt = cyg_nand_get_partition(dev, CYGINT_IO_NAND_TEST_PARTITION)), "partition not present" );
+    CYG_TEST_CHECK( NULL != (prt = cyg_nand_get_partition(dev, CYGNUM_IO_NAND_TEST_PARTITION)), "partition not present" );
 
     /* Check we can read the first page of the partition, and the page
      * before it (which might be off the start of the device) */
diff --git a/packages/io/nand/current/tests/nand_readwrite.c b/packages/io/nand/current/tests/nand_readwrite.c
--- a/packages/io/nand/current/tests/nand_readwrite.c
+++ b/packages/io/nand/current/tests/nand_readwrite.c
@@ -107,7 +107,7 @@ int cyg_user_start(void)
     CYG_TEST_INFO(cyg_nanddevtab->devname);
     CYG_TEST_CHECK(0==cyg_nand_lookup(cyg_nanddevtab->devname, &dev),"lookup failed");
 
-    CYG_TEST_CHECK( NULL != (prt = cyg_nand_get_partition(dev, CYGINT_IO_NAND_TEST_PARTITION)), "partition not present" );
+    CYG_TEST_CHECK( NULL != (prt = cyg_nand_get_partition(dev, CYGNUM_IO_NAND_TEST_PARTITION)), "partition not present" );
 
     /* Now select a usable block in the partition to base ourselves around. */
     blk = 0;
diff --git a/packages/io/nand/current/tests/nand_rwbenchmark.c b/packages/io/nand/current/tests/nand_rwbenchmark.c
--- a/packages/io/nand/current/tests/nand_rwbenchmark.c
+++ b/packages/io/nand/current/tests/nand_rwbenchmark.c
@@ -566,7 +566,7 @@ void rwbenchmark_main(void)
     cyg_nand_lookup(DEVICE, &dev);
     if (!dev)
         CYG_TEST_FAIL_EXIT("can't get device "DEVICE);
-    part = cyg_nand_get_partition(dev, CYGINT_IO_NAND_TEST_PARTITION); 
+    part = cyg_nand_get_partition(dev, CYGNUM_IO_NAND_TEST_PARTITION); 
     if (!part)
         CYG_TEST_FAIL_EXIT("can't get partition");