http://downloads.netgear.com/files/GPL/DM111PSP_v3.61d_GPL.tar.gz

[bcm963xx.git] / bcmdrivers / opensource / char / board / bcm963xx / impl1 / board.c

diff --git a/bcmdrivers/opensource/char/board/bcm963xx/impl1/board.c b/bcmdrivers/opensource/char/board/bcm963xx/impl1/board.c
index 36290ad..a2f380b 100755 (executable)
--- a/bcmdrivers/opensource/char/board/bcm963xx/impl1/board.c
+++ b/bcmdrivers/opensource/char/board/bcm963xx/impl1/board.c
@@ -75,7 +75,6 @@ typedef struct
     unsigned long ulPsiSize;
     unsigned long ulNumMacAddrs;
     unsigned char ucaBaseMacAddr[NVRAM_MAC_ADDRESS_LEN];
-    char chCountry[4]; // USR9108
     MAC_ADDR_INFO MacAddrs[1];
 } NVRAM_INFO, *PNVRAM_INFO;
 
@@ -326,7 +325,6 @@ void __init InitNvramInfo( void )
             memcpy( g_pNvramInfo->ucaBaseMacAddr, pNvramData->ucaBaseMacAddr,
                 NVRAM_MAC_ADDRESS_LEN );
             g_pNvramInfo->ulSdramSize = getMemorySize();
-            strcpy(g_pNvramInfo->chCountry, pNvramData->chCountry); //USR9108
         }
         else
             printk("ERROR - Could not allocate memory for NVRAM data\n");
@@ -621,27 +619,6 @@ int kerSysReleaseMacAddress( unsigned char *pucaMacAddr )
     return( nRet );
 } /* kerSysReleaseMacAddr */
 
-// USR9109/91113
-void kerSysSetMacAddress(unsigned char *pucaMacAddr)
-{
-    UINT32 crc = CRC32_INIT_VALUE;
-    NVRAM_DATA NvramData;
-    volatile unsigned char *mac;
-                                                                                
-    memcpy((char *)&NvramData, (char *)get_nvram_start_addr(), sizeof(NVRAM_DATA));
-                                                                                
-    mac = (unsigned char*)NvramData.ucaBaseMacAddr;
-    printk("Original ucaBaseMacAddr: %02X %02X %02X %02X %02X %02X\r\n", mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
-                                                                                
-    memcpy(NvramData.ucaBaseMacAddr, pucaMacAddr, NVRAM_MAC_ADDRESS_LEN);
-    printk("New Mac: %02X %02X %02X %02X %02X %02X\r\n",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
-                                                                                
-    NvramData.ulCheckSum = 0;
-    NvramData.ulCheckSum = getCrc32((char *)&NvramData, (UINT32) sizeof(NVRAM_DATA), crc);
-    kerSysNvRamSet((char *)&NvramData, sizeof(NVRAM_DATA), NVRAM_VERSION_NUMBER_ADDRESS);
-
-} /* kerSysSetMacAddr */
-
 int kerSysGetSdramSize( void )
 {
     return( (int) g_pNvramInfo->ulSdramSize );
@@ -1177,7 +1154,7 @@ static int board_ioctl( struct inode *inode, struct file *flip,
             else
                 ret = -EFAULT;
             break;
-                                                                                
+
         case BOARD_IOCTL_GET_CHIP_ID:
             ctrlParms.result = (int) (PERF->RevID & 0xFFFF0000) >> 16;
             __copy_to_user((BOARD_IOCTL_PARMS*)arg, &ctrlParms, sizeof(BOARD_IOCTL_PARMS));
@@ -1351,20 +1328,6 @@ static int board_ioctl( struct inode *inode, struct file *flip,
             }
             break;            
 #endif                                                            
-        // USR9108 Wi-Fi Country selection
-        case BOARD_IOCTL_GET_CNTRY_SEL:
-            if (copy_from_user((void*)&ctrlParms, (void*)arg, sizeof(ctrlParms)) == 0) 
-            {
-                __copy_to_user(ctrlParms.string, g_pNvramInfo->chCountry, 4);
-                ctrlParms.result = 0;
-
-                __copy_to_user((BOARD_IOCTL_PARMS*)arg, &ctrlParms,
-                    sizeof(BOARD_IOCTL_PARMS));
-                ret = 0;
-            }
-            else
-                ret = -EFAULT;
-            break;
 
         case BOARD_IOCTL_SET_MONITOR_FD:
             if (copy_from_user((void*)&ctrlParms, (void*)arg, sizeof(ctrlParms)) == 0) {
@@ -1895,7 +1858,6 @@ module_exit( brcm_board_cleanup );
 EXPORT_SYMBOL(kerSysNvRamGet);
 EXPORT_SYMBOL(dumpaddr);
 EXPORT_SYMBOL(kerSysGetMacAddress);
-EXPORT_SYMBOL(kerSysSetMacAddress);    // USR9109/9113
 EXPORT_SYMBOL(kerSysReleaseMacAddress);
 EXPORT_SYMBOL(kerSysGetSdramSize);
 EXPORT_SYMBOL(kerSysLedCtrl);
@@ -1932,5 +1894,3 @@ EXPORT_SYMBOL(kerSysDeregisterDyingGaspHandler);
 EXPORT_SYMBOL(kerSysGetCycleCount);
 EXPORT_SYMBOL(kerSysSetWdTimer);
 EXPORT_SYMBOL(kerSysWakeupMonitorTask);
-EXPORT_SYMBOL(BpUpdateWirelessSromMap);
-