--- a/cisco/CISCO-CABLE-SPECTRUM-MIB.my
+++ b/cisco/CISCO-CABLE-SPECTRUM-MIB.my
@@ -4,7 +4,7 @@
 --   
 -- October 1998 Frances Shen
 --   
--- Copyright (c) 1998, 2000-2006 by Cisco Systems, Inc.
+-- Copyright (c) 1998, 2000-20011, 2011 by Cisco Systems Inc.
 -- All rights reserved.
 -- *****************************************************************
 
@@ -40,7 +40,7 @@
 
 
 ciscoCableSpectrumMIB MODULE-IDENTITY
-    LAST-UPDATED    "200610100000Z"
+    LAST-UPDATED    "201104080000Z"
     ORGANIZATION    "Cisco Systems, Inc."
     CONTACT-INFO
             "Cisco Systems
@@ -74,6 +74,11 @@
         detected to go on-line and off-line by flap detectors, the
         cable operators can look at the flap list and spectrum
         tables to determine the possible causes."
+    REVISION        "201104080000Z"
+    DESCRIPTION
+        "1. Changed Range Of Ccsfrequency And Ccsmeasuredfrequency
+        Textual-Convention To Support The Docsis 3.0 Extended Upstream
+        Frequency Range."
     REVISION        "200610100000Z"
     DESCRIPTION
         "1. Added spectrum group global configuration table
@@ -161,7 +166,7 @@
         1. ccsSpectrumObjects to provide spectrum information
         2. ccsConfigObjects to support spectrum management
            functions."
-          ::= { ciscoMgmt 114 }
+    ::= { ciscoMgmt 114 }
 
 
 
@@ -170,21 +175,22 @@
     DESCRIPTION
         "This data type represents the frequency.
         The unit is in KHz.
-        A range of 5000KHz to 42000KHz is appropriate for a cable
-        plant using a North American Sub-Split channel plan.
-        The spectrum range has been expanded to accommodate
-        an upper edge of 65000KHz for some European channel plans.
-        If DOCSIS is extended to cover other types of channel
-        plans (and frequency allocations) this object will
-        be modified accordingly."
-    SYNTAX          Integer32 (5000..65000 )
+        A range of 5000KHz to 42000KHz is appropriate for a cable plant
+        using a North American Sub-Split channel plan. The spectrum
+        range has been expanded to accommodate an upper edge of 65000KHz
+        for some European channel plans. The spectrum range has been
+        further expanded with DOCSIS 3.0 to an upper edge of 85000KHz.If
+        DOCSIS is extended to cover other types of channel plans (and
+        frequency allocations) this object will be modified
+        accordingly."
+    SYNTAX          Integer32 (5000..85000)
 
 CCSMeasuredFrequency ::= TEXTUAL-CONVENTION
     STATUS          current
     DESCRIPTION
         "This data type represents the actual measured frequency.
         The unit is in KHz."
-    SYNTAX          Integer32 (4000..65000 )
+    SYNTAX          Integer32 (4000..85000)
 
 CCSRequestOperation ::= TEXTUAL-CONVENTION
     STATUS          current
@@ -289,8 +295,9 @@
 -- poor or failing plant components.  It may also
 -- indicate the exposure of plant components to the forces of wind,
 -- moisture, or temperature.
+
 ccsFlapListMaxSize OBJECT-TYPE
-    SYNTAX          Integer32 (1..65536 )
+    SYNTAX          Integer32 (1..65536)
     UNITS           "modems"
     MAX-ACCESS      read-write
     STATUS          current
@@ -306,7 +313,7 @@
     ::= { ccsFlapObjects 1 }
 
 ccsFlapListCurrentSize OBJECT-TYPE
-    SYNTAX          Gauge32 (0..65536 )
+    SYNTAX          Gauge32 (0..65536)
     UNITS           "modems"
     MAX-ACCESS      read-only
     STATUS          current
@@ -317,7 +324,7 @@
     ::= { ccsFlapObjects 2 }
 
 ccsFlapAging OBJECT-TYPE
-    SYNTAX          Integer32 (1..86400 )
+    SYNTAX          Integer32 (1..86400)
     UNITS           "minutes"
     MAX-ACCESS      read-write
     STATUS          current
@@ -329,7 +336,7 @@
     ::= { ccsFlapObjects 3 }
 
 ccsFlapInsertionTime OBJECT-TYPE
-    SYNTAX          Integer32 (60..86400 )
+    SYNTAX          Integer32 (60..86400)
     UNITS           "seconds"
     MAX-ACCESS      read-write
     STATUS          current
@@ -864,7 +871,7 @@
 
 
 ccsFlapPowerAdjustThreshold OBJECT-TYPE
-    SYNTAX          Integer32 (1..10 )
+    SYNTAX          Integer32 (1..10)
     UNITS           "db"
     MAX-ACCESS      read-write
     STATUS          deprecated
@@ -876,7 +883,7 @@
     ::= { ccsFlapObjects 6 }
 
 ccsFlapMissThreshold OBJECT-TYPE
-    SYNTAX          Unsigned32 (1..12 )
+    SYNTAX          Unsigned32 (1..12)
     MAX-ACCESS      read-write
     STATUS          deprecated
     DESCRIPTION
@@ -1305,7 +1312,7 @@
 }
 
 ccsSpectrumRequestIndex OBJECT-TYPE
-    SYNTAX          Integer32 (1..100 )
+    SYNTAX          Integer32 (1..100)
     MAX-ACCESS      not-accessible
     STATUS          current
     DESCRIPTION
@@ -1386,7 +1393,7 @@
     ::= { ccsSpectrumRequestEntry 5 }
 
 ccsSpectrumRequestResolution OBJECT-TYPE
-    SYNTAX          Integer32 (12..37000 )
+    SYNTAX          Integer32 (12..37000)
     UNITS           "KHz"
     MAX-ACCESS      read-create
     STATUS          current
@@ -1537,7 +1544,8 @@
     SYNTAX          SEQUENCE OF CcsSNRRequestEntry 
     MAX-ACCESS      not-accessible
     STATUS          current
-    DESCRIPTION     "A table of CNR requests."
+    DESCRIPTION
+        "A table of CNR requests."
     ::= { ccsSpectrumObjects 3 }
 
 ccsSNRRequestEntry OBJECT-TYPE
@@ -1563,7 +1571,7 @@
 }
 
 ccsSNRRequestIndex OBJECT-TYPE
-    SYNTAX          Integer32 (1..100 )
+    SYNTAX          Integer32 (1..100)
     MAX-ACCESS      not-accessible
     STATUS          current
     DESCRIPTION
@@ -1581,7 +1589,7 @@
     ::= { ccsSNRRequestEntry 2 }
 
 ccsSNRRequestSNR OBJECT-TYPE
-    SYNTAX          Integer32 (-100..100 )
+    SYNTAX          Integer32 (-100..100)
     UNITS           "dB"
     MAX-ACCESS      read-only
     STATUS          current
@@ -1648,8 +1656,7 @@
     DESCRIPTION
         "The control that allows modification, creation, and
         deletion of entries.  For detailed rules see the
-        ccsSpectrumRequestEntry DESCRIPTION.
-        " 
+        ccsSpectrumRequestEntry DESCRIPTION." 
     ::= { ccsSNRRequestEntry 8 }
  
 
@@ -1686,7 +1693,7 @@
 }
 
 ccsSpecGroupNumber OBJECT-TYPE
-    SYNTAX          Unsigned32 (1..4294967295 )
+    SYNTAX          Unsigned32 (1..4294967295)
     MAX-ACCESS      not-accessible
     STATUS          current
     DESCRIPTION
@@ -1708,7 +1715,8 @@
     SYNTAX          StorageType
     MAX-ACCESS      read-create
     STATUS          current
-    DESCRIPTION     "The storage type for this conceptual row." 
+    DESCRIPTION
+        "The storage type for this conceptual row." 
     ::= { ccsUpInSpecGroupEntry 3 }
 
 ccsSpecGroupUpstreamRowStatus OBJECT-TYPE
@@ -1754,7 +1762,7 @@
 }
 
 ccsFiberNodeNumber OBJECT-TYPE
-    SYNTAX          Unsigned32 (1..4294967295 )
+    SYNTAX          Unsigned32 (1..4294967295)
     MAX-ACCESS      not-accessible
     STATUS          current
     DESCRIPTION
@@ -1776,7 +1784,8 @@
     SYNTAX          StorageType
     MAX-ACCESS      read-create
     STATUS          current
-    DESCRIPTION     "The storage type for this conceptual row." 
+    DESCRIPTION
+        "The storage type for this conceptual row." 
     ::= { ccsUpInFiberNodeEntry 3 }
 
 ccsFiberNodeUpstreamRowStatus OBJECT-TYPE
@@ -1816,7 +1825,7 @@
     ::= { ccsUpSpecMgmtTable 1 }
 
 CcsUpSpecMgmtEntry ::= SEQUENCE {
-        ccsUpSpecMgmtHopPriority         INTEGER ,
+        ccsUpSpecMgmtHopPriority         INTEGER,
         ccsUpSpecMgmtSnrThres1           Integer32,
         ccsUpSpecMgmtSnrThres2           Integer32,
         ccsUpSpecMgmtFecCorrectThres1    Integer32,
@@ -1824,7 +1833,7 @@
         ccsUpSpecMgmtFecUnCorrectThres1  Integer32,
         ccsUpSpecMgmtFecUnCorrectThres2  Integer32,
         ccsUpSpecMgmtSnrPollPeriod       Integer32,
-        ccsUpSpecMgmtHopCondition        INTEGER ,
+        ccsUpSpecMgmtHopCondition        INTEGER,
         ccsUpSpecMgmtFromCenterFreq      Unsigned32,
         ccsUpSpecMgmtToCenterFreq        Unsigned32,
         ccsUpSpecMgmtFromBandWidth       Unsigned32,
@@ -1872,7 +1881,7 @@
     ::= { ccsUpSpecMgmtEntry 1 }
 
 ccsUpSpecMgmtSnrThres1 OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  5..35 )
+    SYNTAX          Integer32 (0 | 5..35)
     UNITS           "dB"
     MAX-ACCESS      read-write
     STATUS          current
@@ -1890,7 +1899,7 @@
     ::= { ccsUpSpecMgmtEntry 2 }
 
 ccsUpSpecMgmtSnrThres2 OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  5..35 )
+    SYNTAX          Integer32 (0 | 5..35)
     UNITS           "dB"
     MAX-ACCESS      read-write
     STATUS          current
@@ -1912,7 +1921,7 @@
     ::= { ccsUpSpecMgmtEntry 3 }
 
 ccsUpSpecMgmtFecCorrectThres1 OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  1..30 )
+    SYNTAX          Integer32 (0 | 1..30)
     MAX-ACCESS      read-write
     STATUS          current
     DESCRIPTION
@@ -1929,7 +1938,7 @@
     ::= { ccsUpSpecMgmtEntry 4 }
 
 ccsUpSpecMgmtFecCorrectThres2 OBJECT-TYPE
-    SYNTAX          Integer32 (1..20 )
+    SYNTAX          Integer32 (1..20)
     MAX-ACCESS      read-write
     STATUS          deprecated
     DESCRIPTION
@@ -1946,7 +1955,7 @@
     ::= { ccsUpSpecMgmtEntry 5 }
 
 ccsUpSpecMgmtFecUnCorrectThres1 OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  1..30 )
+    SYNTAX          Integer32 (0 | 1..30)
     MAX-ACCESS      read-write
     STATUS          current
     DESCRIPTION
@@ -1962,7 +1971,7 @@
     ::= { ccsUpSpecMgmtEntry 6 }
 
 ccsUpSpecMgmtFecUnCorrectThres2 OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  1..30 )
+    SYNTAX          Integer32 (0 | 1..30)
     MAX-ACCESS      read-write
     STATUS          current
     DESCRIPTION
@@ -1980,7 +1989,7 @@
     ::= { ccsUpSpecMgmtEntry 7 }
 
 ccsUpSpecMgmtSnrPollPeriod OBJECT-TYPE
-    SYNTAX          Integer32 (500..25000 )
+    SYNTAX          Integer32 (500..25000)
     UNITS           "msec"
     MAX-ACCESS      read-write
     STATUS          deprecated
@@ -2015,7 +2024,7 @@
     ::= { ccsUpSpecMgmtEntry 9 }
 
 ccsUpSpecMgmtFromCenterFreq OBJECT-TYPE
-    SYNTAX          Unsigned32 (0 |  5000..65000 )
+    SYNTAX          Unsigned32 (0 | 5000..65000)
     UNITS           "KHz"
     MAX-ACCESS      read-only
     STATUS          current
@@ -2027,7 +2036,7 @@
     ::= { ccsUpSpecMgmtEntry 10 }
 
 ccsUpSpecMgmtToCenterFreq OBJECT-TYPE
-    SYNTAX          Unsigned32 (0 |  5000..65000 )
+    SYNTAX          Unsigned32 (0 | 5000..65000)
     UNITS           "KHz"
     MAX-ACCESS      read-only
     STATUS          current
@@ -2043,7 +2052,8 @@
     UNITS           "KHz"
     MAX-ACCESS      read-only
     STATUS          current
-    DESCRIPTION     "Bandwidth before hopping occurs." 
+    DESCRIPTION
+        "Bandwidth before hopping occurs." 
     ::= { ccsUpSpecMgmtEntry 12 }
 
 ccsUpSpecMgmtToBandWidth OBJECT-TYPE
@@ -2051,11 +2061,12 @@
     UNITS           "KHz"
     MAX-ACCESS      read-only
     STATUS          current
-    DESCRIPTION     "Current bandwidth." 
+    DESCRIPTION
+        "Current bandwidth." 
     ::= { ccsUpSpecMgmtEntry 13 }
 
 ccsUpSpecMgmtFromModProfile OBJECT-TYPE
-    SYNTAX          Integer32 (1..2147483647 )
+    SYNTAX          Integer32 (1..2147483647)
     MAX-ACCESS      read-only
     STATUS          current
     DESCRIPTION
@@ -2069,7 +2080,7 @@
     ::= { ccsUpSpecMgmtEntry 14 }
 
 ccsUpSpecMgmtToModProfile OBJECT-TYPE
-    SYNTAX          Integer32 (1..2147483647 )
+    SYNTAX          Integer32 (1..2147483647)
     MAX-ACCESS      read-only
     STATUS          current
     DESCRIPTION
@@ -2083,7 +2094,7 @@
     ::= { ccsUpSpecMgmtEntry 15 }
 
 ccsUpSpecMgmtSNR OBJECT-TYPE
-    SYNTAX          Integer32 (-100..100 )
+    SYNTAX          Integer32 (-100..100)
     UNITS           "dB"
     MAX-ACCESS      read-only
     STATUS          current
@@ -2099,11 +2110,12 @@
     UNITS           "KHz"
     MAX-ACCESS      read-only
     STATUS          current
-    DESCRIPTION     "Upper bound frequency that the upstream supports." 
+    DESCRIPTION
+        "Upper bound frequency that the upstream supports." 
     ::= { ccsUpSpecMgmtEntry 17 }
 
 ccsUpSpecMgmtCnrThres1 OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  5..35 )
+    SYNTAX          Integer32 (0 | 5..35)
     UNITS           "dB"
     MAX-ACCESS      read-write
     STATUS          current
@@ -2122,7 +2134,7 @@
     ::= { ccsUpSpecMgmtEntry 18 }
 
 ccsUpSpecMgmtCnrThres2 OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  5..35 )
+    SYNTAX          Integer32 (0 | 5..35)
     UNITS           "dB"
     MAX-ACCESS      read-write
     STATUS          current
@@ -2144,7 +2156,7 @@
     ::= { ccsUpSpecMgmtEntry 19 }
 
 ccsUpSpecMgmtCNR OBJECT-TYPE
-    SYNTAX          Integer32 (-100..100 )
+    SYNTAX          Integer32 (-100..100)
     UNITS           "dB"
     MAX-ACCESS      read-only
     STATUS          current
@@ -2156,7 +2168,7 @@
     ::= { ccsUpSpecMgmtEntry 20 }
 
 ccsUpSpecMgmtMissedMaintMsgThres OBJECT-TYPE
-    SYNTAX          Integer32 (0..100 )
+    SYNTAX          Integer32 (0..100)
     MAX-ACCESS      read-only
     STATUS          current
     DESCRIPTION
@@ -2167,7 +2179,7 @@
     ::= { ccsUpSpecMgmtEntry 21 }
 
 ccsUpSpecMgmtHopPeriod OBJECT-TYPE
-    SYNTAX          Integer32 (0 |  1..3600 )
+    SYNTAX          Integer32 (0 | 1..3600)
     UNITS           "seconds"
     MAX-ACCESS      read-only
     STATUS          current
@@ -2312,7 +2324,7 @@
 
 CcsSpecGroupFreqEntry ::= SEQUENCE {
         ccsSpecGroupFreqIndex Unsigned32,
-        ccsSpecGroupFreqType  INTEGER ,
+        ccsSpecGroupFreqType  INTEGER,
         ccsSpecGroupFreqLower Integer32,
         ccsSpecGroupFreqUpper Integer32,
         ccsSpecGroupStorage   StorageType,
@@ -2320,7 +2332,7 @@
 }
 
 ccsSpecGroupFreqIndex OBJECT-TYPE
-    SYNTAX          Unsigned32 (1..4294967295 )
+    SYNTAX          Unsigned32 (1..4294967295)
     MAX-ACCESS      not-accessible
     STATUS          current
     DESCRIPTION
@@ -2347,7 +2359,7 @@
     ::= { ccsSpecGroupFreqEntry 2 }
 
 ccsSpecGroupFreqLower OBJECT-TYPE
-    SYNTAX          Integer32 (0..1000000000 )
+    SYNTAX          Integer32 (0..1000000000)
     UNITS           "Hz"
     MAX-ACCESS      read-create
     STATUS          current
@@ -2363,7 +2375,7 @@
     ::= { ccsSpecGroupFreqEntry 3 }
 
 ccsSpecGroupFreqUpper OBJECT-TYPE
-    SYNTAX          Integer32 (0..1000000000 )
+    SYNTAX          Integer32 (0..1000000000)
     UNITS           "Hz"
     MAX-ACCESS      read-create
     STATUS          current
@@ -2382,7 +2394,8 @@
     SYNTAX          StorageType
     MAX-ACCESS      read-create
     STATUS          current
-    DESCRIPTION     "The storage type for this conceptual row." 
+    DESCRIPTION
+        "The storage type for this conceptual row." 
     ::= { ccsSpecGroupFreqEntry 5 }
 
 ccsSpecGroupRowStatus OBJECT-TYPE
@@ -2411,12 +2424,12 @@
  
 
 -- Notification group
+
 ciscoCableSpectrumMIBNotificationPrefix  OBJECT IDENTIFIER
     ::= { ciscoCableSpectrumMIB 2 }
 
 ccsMIBNotifications  OBJECT IDENTIFIER
     ::= { ciscoCableSpectrumMIBNotificationPrefix 0 }
-
 
 
 ccsHoppingNotification NOTIFICATION-TYPE
@@ -2439,7 +2452,6 @@
         SNR or modemOffline that caused the hopping."
    ::= { ccsMIBNotifications 1 }
 
-
 ccsSpecMgmtNotification NOTIFICATION-TYPE
     OBJECTS         {
                         ccsUpSpecMgmtCriteria,
@@ -2458,6 +2470,7 @@
         cause(s)."
    ::= { ccsMIBNotifications 2 }
 -- Conformance statement
+
 ciscoCableSpectrumMIBConformance  OBJECT IDENTIFIER
     ::= { ciscoCableSpectrumMIB 3 }
 
@@ -2469,6 +2482,7 @@
 
 
 -- compliance statements
+
 ccsCompliance MODULE-COMPLIANCE
     STATUS          obsolete
     DESCRIPTION
@@ -2540,7 +2554,7 @@
                     }
 
     OBJECT          ccsFlapListMaxSize
-    WRITE-SYNTAX    Integer32(1..8191 )
+    WRITE-SYNTAX    Integer32(1..8191)
     DESCRIPTION
         "Current implementation limits the upper bound to 8191."
     ::= { ciscoCableSpectrumMIBCompliances 5 }
@@ -2560,7 +2574,7 @@
                     }
 
     OBJECT          ccsFlapListMaxSize
-    WRITE-SYNTAX    Integer32(1..8191 )
+    WRITE-SYNTAX    Integer32(1..8191)
     DESCRIPTION
         "Current implementation limits the upper bound to 8191."
     ::= { ciscoCableSpectrumMIBCompliances 6 }
@@ -2583,7 +2597,7 @@
                     }
 
     OBJECT          ccsFlapListMaxSize
-    WRITE-SYNTAX    Integer32(1..8191 )
+    WRITE-SYNTAX    Integer32(1..8191)
     DESCRIPTION
         "Current implementation limits the upper bound to 8191."
 
@@ -2636,6 +2650,7 @@
     ::= { ciscoCableSpectrumMIBCompliances 7 }
 
 -- units of conformance
+
 ccsFlapGroup OBJECT-GROUP
     OBJECTS         {
                         ccsFlapListMaxSize,
@@ -2946,3 +2961,321 @@
 
 END
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+