On Thu, Apr 4, 2013 at 7:09 PM, Dan Gora <d...@adax.com> wrote:
> On Thu, Apr 4, 2013 at 10:35 AM, Zdenek Styblik
> <zdenek.styb...@gmail.com> wrote:
>> On Fri, Mar 22, 2013 at 1:12 AM, Dan Gora <d...@adax.com> wrote:
>>> This code was moved to ipmi_main.c from open.c and in the change a bug
>>> was introduced where the PICMG Get Device Locator command would not
>>> be run unless the user explicitly set my_addr to 0 with the -m command.
>>>
>>> The more sensible thing to do is to run this unless the user explictly
>>> overrides it with the -m option.
>>>
>>
>> I'll leave this one to Jim, or somebody else to decide, since this
>> could be connected to IPMI bridging.
>>
>> However, I NACK part 3 and 4 of this patch. Ok, 3rd one deletes empty
>> line. The 4th one, I really don't get what kind of issue you had with
>> formatting there, but it looks ok to me as it is now.
>
> So that the lines don't wrap around 80 columns... I'm trying to
> improve the code formatting of things a bit as it's a real hodge-podge
> of styles. ipmi_ekanalyzer.c is a total mess, but I can see that it
> was just lifted whole-hog from ipmiutils.
>
Yes, I've guessed what it was about. Part/chunk 3 was alright-ish.
Part/chunk 4 does nothing what you say. These lines end at 61/66 thus
I see no reason why they should be split up. Or am I missing
something?
> That said it seems kind of silly to make me have to redo this whole
> patch because of one removed line (ie NACKing part 3 (I assume you
> mean chunk 3 of the patch, right?)
>
You don't have to re-do anything. I guess anybody who's going to
commit that can handle text editor and "delete" key ;)
Thanks,
Z.
> thanks
> dan
>
>>
>> Z.
>>
>>
>>> Signed-off-by: Dan Gora <d...@adax.com>
>>> ---
>>> ipmitool/lib/ipmi_main.c | 14 +++++++++-----
>>> 1 files changed, 9 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/ipmitool/lib/ipmi_main.c b/ipmitool/lib/ipmi_main.c
>>> index ce98ef4..a2f3500 100644
>>> --- a/ipmitool/lib/ipmi_main.c
>>> +++ b/ipmitool/lib/ipmi_main.c
>>> @@ -363,7 +363,7 @@ ipmi_main(int argc, char ** argv,
>>> uint8_t transit_addr = 0;
>>> uint8_t transit_channel = 0;
>>> uint8_t target_lun = 0;
>>> - uint8_t my_addr = 0x20;
>>> + uint8_t my_addr = 0;
>>> uint16_t my_long_packet_size=0;
>>> uint8_t my_long_packet_set=0;
>>> uint8_t lookupbit = 0x10; /* use name-only lookup by default
>>> */
>>> @@ -854,6 +854,9 @@ ipmi_main(int argc, char ** argv,
>>> if (my_addr) {
>>> ipmi_main_intf->my_addr = my_addr;
>>> } else {
>>> + /* Use the default for the payload source address */
>>> + my_addr = 0x20;
>>> +
>>> /* Check if PICMG extension is available to use the function
>>> * GetDeviceLocator to retreive i2c address PICMG hack to
>>> set
>>> * right IPMB address, If extension is not supported, should
>>> @@ -861,7 +864,6 @@ ipmi_main(int argc, char ** argv,
>>> * PICMG Extension Version 2.0 (PICMG 3.0 Revision 1.0
>>> ATCA) to
>>> * PICMG Extension Version 2.3 (PICMG 3.0 Revision 3.0
>>> ATCA)
>>> */
>>> -
>>> /* First, check if PICMG extension is available and
>>> supported */
>>> struct ipmi_rq req;
>>> struct ipmi_rs *rsp;
>>> @@ -880,10 +882,12 @@ ipmi_main(int argc, char ** argv,
>>> rsp = ipmi_main_intf->sendrecv(ipmi_main_intf, &req);
>>> if (rsp && !rsp->ccode) {
>>> if ( (rsp->data[0] == 0) &&
>>> - ((rsp->data[1] & 0x0F) ==
>>> PICMG_ATCA_MAJOR_VERSION) ) {
>>> + ((rsp->data[1] & 0x0F) ==
>>> PICMG_ATCA_MAJOR_VERSION)){
>>> version_accepted = 1;
>>> - lprintf(LOG_INFO, "Discovered PICMG
>>> Extension %d.%d",
>>> - (rsp->data[1] & 0x0f),
>>> (rsp->data[1] >> 4));
>>> + lprintf(LOG_INFO,
>>> + "Discovered PICMG Extension %d.%d",
>>> + (rsp->data[1] & 0x0f),
>>> + (rsp->data[1] >> 4));
>>> }
>>> }
>>>
>>> --
>>> 1.7.7
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
Ipmitool-devel mailing list
Ipmitool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipmitool-devel
