Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: cli_mfg.c

Issue 6897014: Do not call EC programmer shutdown functions explicitly. (Closed) Base URL: svn://coreboot.org/flashrom/trunk
Patch Set: rename shutdown() to flashrom_shutdown() to avoid conflict with shutdown(2) Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cli_classic.c ('k') | flashrom.c » ('j') | flashrom.c » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of the flashrom project. 2 * This file is part of the flashrom project.
3 * 3 *
4 * Copyright (C) 2000 Silicon Integrated System Corporation 4 * Copyright (C) 2000 Silicon Integrated System Corporation
5 * Copyright (C) 2004 Tyan Corp <yhlu@tyan.com> 5 * Copyright (C) 2004 Tyan Corp <yhlu@tyan.com>
6 * Copyright (C) 2005-2008 coresystems GmbH 6 * Copyright (C) 2005-2008 coresystems GmbH
7 * Copyright (C) 2008,2009,2010 Carl-Daniel Hailfinger 7 * Copyright (C) 2008,2009,2010 Carl-Daniel Hailfinger
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 rc = flash->wp->list_ranges(flash); 599 rc = flash->wp->list_ranges(flash);
600 goto cli_mfg_silent_exit; 600 goto cli_mfg_silent_exit;
601 } 601 }
602 602
603 if (read_it || write_it || erase_it || verify_it) 603 if (read_it || write_it || erase_it || verify_it)
604 rc = doit(flash, force, filename, 604 rc = doit(flash, force, filename,
605 read_it, write_it, erase_it, verify_it); 605 read_it, write_it, erase_it, verify_it);
606 606
607 msg_ginfo("%s\n", rc ? "FAILED" : "SUCCESS"); 607 msg_ginfo("%s\n", rc ? "FAILED" : "SUCCESS");
608 cli_mfg_silent_exit: 608 cli_mfg_silent_exit:
609 » programmer_shutdown();» /* must be done after chip_restore() */ 609 » flashrom_shutdown();» /* must be done after chip_restore() */
610 cli_mfg_release_lock_exit: 610 cli_mfg_release_lock_exit:
611 #if USE_BIG_LOCK == 1 611 #if USE_BIG_LOCK == 1
612 release_big_lock(); 612 release_big_lock();
613 #endif 613 #endif
614 return rc; 614 return rc;
615 } 615 }
OLDNEW
« no previous file with comments | « cli_classic.c ('k') | flashrom.c » ('j') | flashrom.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698