X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fm68hc11%2Fdv-nvram.c;h=705c1203716612aaf4377be87b6b974644665468;hb=7a77f1ac2c6f899faa39e8c0b42d4284d586c44e;hp=39bd6f24fb138b5ececd5c792173e614ccf9dc96;hpb=63348d048f2d0bdaa82071e72708c7345ba2a3bf;p=deliverable%2Fbinutils-gdb.git diff --git a/sim/m68hc11/dv-nvram.c b/sim/m68hc11/dv-nvram.c index 39bd6f24fb..705c120371 100644 --- a/sim/m68hc11/dv-nvram.c +++ b/sim/m68hc11/dv-nvram.c @@ -1,21 +1,20 @@ /* dv-nvram.c -- Generic driver for a non volatile ram (battery saved) - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999-2020 Free Software Foundation, Inc. Written by Stephane Carrez (stcarrez@worldnet.fr) (From a driver model Contributed by Cygnus Solutions.) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + along with this program. If not, see . */ @@ -187,7 +186,7 @@ attach_nvram_regs (struct hw *me, struct nvram *controller) case NVRAM_SAVE_MODIFIED: case NVRAM_SAVE_ALL: - controller->data = (char*) malloc (attach_size); + controller->data = hw_malloc (me, attach_size); if (controller->data == 0) hw_abort (me, "Not enough memory, try to use the mode 'map'"); @@ -204,7 +203,7 @@ attach_nvram_regs (struct hw *me, struct nvram *controller) if (result != attach_size) { oerrno = errno; - free (controller->data); + hw_free (me, controller->data); close (controller->fd); errno = oerrno; hw_abort (me, "Failed to save the ram content"); @@ -216,7 +215,7 @@ attach_nvram_regs (struct hw *me, struct nvram *controller) if (result != attach_size) { oerrno = errno; - free (controller->data); + hw_free (me, controller->data); close (controller->fd); errno = oerrno; hw_abort (me, "Failed to load the ram content");