jimbo sync

app/goahead-5.1.0/src/auth.txt

@@ -15,7 +15,6 @@
 #   Define a user
 #       user name=joshua password=2fd6e47ff9bb70c0465fd2f5c8e5305e roles=manager,purchaser
 #
-<<<<<<< HEAD
 
 
 role name=person abilities=breathe
@@ -27,6 +26,4 @@ user name=julie password=13fe720f98d63de9d25ad4aaf595dcf9 roles=user
 user name=joshua password=be9ff0562e911e00f2bbbbad1d1a40c1 roles=administrator,purchase
 user name=mary password=13fe720f98d63de9d25ad4aaf595dcf9 roles=user
 user name=peter password=13fe720f98d63de9d25ad4aaf595dcf9 roles=user
-=======
 user name=admin password=2fd6e47ff9bb70c0465fd2f5c8e5305e roles=manager,purchaser
->>>>>>> master

app/goahead-5.1.0/src/libipmi/src/libipmi_IPM.c

@@ -0,0 +1,144 @@
+/*****************************************************************
+******************************************************************
+***                                                            ***
+***        (C)Copyright 2008, American Megatrends Inc.         ***
+***                                                            ***
+***                    All Rights Reserved                     ***
+***                                                            ***
+***       5555 Oakbrook Parkway, Norcross, GA 30093, USA       ***
+***                                                            ***
+***                     Phone 770.246.8600                     ***
+***                                                            ***
+******************************************************************
+******************************************************************
+******************************************************************
+* 
+* Filename: libipmi_IPM.c
+*
+* Descriptions: Contains implementation of Device specific
+*   high level functions
+*
+* Author: Rajasekhar
+*
+******************************************************************/
+#include "libipmi_IPM.h"
+
+
+#include <string.h>
+
+/**
+\breif	Executes GetDeviceID IPMI command.
+ @param	pSession		[in]Session handle
+ @param	pGetDeviceID	[out]Device ID structure according to IPMI Spec
+ @param	timeout			[in]timeout value in seconds.
+
+ @retval Returns LIBIPMI_STATUS_SUCCESS on success and error codes on failure
+*/
+uint16_t	IPMICMD_GetDeviceID( IPMI20_SESSION_T *pSession, GetDevIDRes_T	*pGetDeviceID, int timeout )
+{
+	uint8_t		Req [20];
+	uint32_t		dwResLen;
+	uint16_t		wRet;
+
+	//dwResLen = sizeof(GetDevIDRes_T);
+	wRet = LIBIPMI_Send_RAW_IPMI2_0_Command(pSession, PAYLOAD_TYPE_IPMI,
+											DEFAULT_NET_FN_LUN, CMD_GET_DEV_ID,
+											Req, 0,
+											(uint8_t*)pGetDeviceID, &dwResLen,
+											timeout);
+	return wRet;
+}
+
+/**
+\breif	Executes GetDeviceGUID IPMI command.
+ @param	pSession		[in]Session handle
+ @param	pGetDeviceID	[out]Device GUID structure according to IPMI Spec
+ @param	timeout			[in]timeout value in seconds.
+
+ @retval Returns LIBIPMI_STATUS_SUCCESS on success and error codes on failure
+*/
+uint16_t	IPMICMD_GetDeviceGUID( IPMI20_SESSION_T *pSession, GetDevGUIDRes_T *pGetDeviceGUID, int timeout )
+{
+	uint8_t		Req [20];
+	uint32		dwResLen;
+	uint16_t		wRet;
+
+	dwResLen = sizeof(GetDevGUIDRes_T);
+	wRet = LIBIPMI_Send_RAW_IPMI2_0_Command(pSession, PAYLOAD_TYPE_IPMI,
+											DEFAULT_NET_FN_LUN, CMD_GET_DEV_GUID,
+											Req, 0,
+											(uint8_t*)pGetDeviceGUID, &dwResLen,
+											timeout);
+	printf("---> log22 pSession = %#x\n",(int)pSession);
+	return wRet;
+}
+
+
+/**
+\breif	Higher level function for retrieving DeviceID.
+		Calls IPMICMD_GetDeviceID internally.
+ @param	pSession		[in]Session handle
+ @param	pszDeviceID		[out]Device ID in the form of chars
+ @param	timeout			[in]timeout value in seconds.
+
+ @retval Returns LIBIPMI_STATUS_SUCCESS on success and error codes on failure
+*/
+uint16_t LIBIPMI_HL_GetDeviceID( IPMI20_SESSION_T *pSession, char *pszDeviceID, int timeout )
+{
+	uint8_t	i;
+	uint16_t	wRet;
+	char	szTemp[10];
+	GetDevIDRes_T	DeviceID;
+
+	pszDeviceID[0] = (char)0;
+	
+	wRet = IPMICMD_GetDeviceID( pSession, &DeviceID, timeout);
+
+	if (wRet == LIBIPMI_E_SUCCESS)
+	{
+		uint8_t	*pbyRes;
+		pbyRes = (uint8_t *) &DeviceID;
+		for (i = 0; i < (uint8_t)sizeof(GetDevIDRes_T); i++ )
+		{
+			sprintf (szTemp, "%x ", pbyRes[i]);
+			strcat(pszDeviceID, szTemp);
+		}
+	}
+	
+	return wRet;
+}
+
+/**
+\breif	Higher level function for retrieving Device GUID.
+		Calls IPMICMD_GetDeviceGUID internally.
+ @param	pSession		[in]Session handle
+ @param	pszDeviceID		[out]Device GUID in the form of chars
+ @param	timeout			[in]timeout value in seconds.
+
+ @retval Returns LIBIPMI_STATUS_SUCCESS on success and error codes on failure
+*/
+uint16_t LIBIPMI_HL_GetDeviceGUID( IPMI20_SESSION_T *pSession, char *pszDeviceGUID, int timeout )
+{
+	uint8_t	i;
+	uint16_t	wRet;
+	char	szTemp[10];
+	GetDevGUIDRes_T DeviceGUID;
+
+	pszDeviceGUID[0] = (char)0;
+	
+	wRet = IPMICMD_GetDeviceGUID( pSession, &DeviceGUID, timeout);
+
+	if (wRet == LIBIPMI_E_SUCCESS)
+	{
+		uint8_t	*pbyRes;
+		pbyRes = (uint8_t *) &DeviceGUID;
+		for (i = 0; i < (uint8_t)sizeof(GetDevGUIDRes_T); i++ )
+		{
+			sprintf (szTemp, "%x ", pbyRes[i]);
+			strcat(pszDeviceGUID, szTemp);
+		}
+	}
+	
+	return wRet;
+}
+